Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 11 Dec 2018 14:56:04 +0000 (15:56 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 11 Dec 2018 14:56:04 +0000 (15:56 +0100)
commit4d115f21595d255f2d335d2f307ee822b381ea54
treedbbd84b1539f4b87df608cb3e7c84cfde5fcb3f6
parent54e1d3815762ef964a74f179ef846110673e743f
parent66d8bfb85c61aafe3bad2edf0e7b4d9d694ee2e7
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_python.cpp
intern/cycles/render/image.cpp
intern/cycles/render/image.h