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)
1  2 
release/datafiles/colormanagement/config.ocio