Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 4 May 2017 08:05:01 +0000 (10:05 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 4 May 2017 08:05:01 +0000 (10:05 +0200)
commitc8d45a7e970c7b35800d95872857cc99a5bff432
tree2716df750c9f80cadef0e0de977585091a74cb6a
parent55ae54c469e10a5a7327a739b68316b91ee81472
parent5fde78dcad66f2d47aacff685263aa4b593877d7
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_sync.cpp