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)
1  2 
intern/cycles/blender/blender_sync.cpp