Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 7 Nov 2017 12:57:16 +0000 (13:57 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 7 Nov 2017 12:57:16 +0000 (13:57 +0100)
commit3cfbdc2bb43796545c27239a2a3a339e355e96a9
tree3264cca91cba0135cce42a766d798bd16c7470f9
parentc83b171794fcdd57a9d880750da22b62d2cd1e3d
parent1a1fb5a47cd03a85b350825ecd46b0ea7a160319
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_sync.cpp