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)
1  2 
intern/cycles/blender/blender_python.cpp
intern/cycles/render/image.cpp
intern/cycles/render/image.h

Simple merge
Simple merge