Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 6 Nov 2018 19:04:06 +0000 (20:04 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 6 Nov 2018 19:04:06 +0000 (20:04 +0100)
commitad248333a6f844ccee8ea7788b8dd3d8c2979ef8
treeb05bff0a3b398def29d291478edd69746d26f2f7
parentd323c0ad9c5f862b328fd2d71317a9bde0e2d8a9
parent81e2515a0460a6b090e28efab50d95de390043c6
Merge branch 'master' into blender2.8
release/datafiles/colormanagement/config.ocio