Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 26 May 2017 09:57:28 +0000 (19:57 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 26 May 2017 09:57:28 +0000 (19:57 +1000)
commitf2a8b74c2572258391c5847c177e59266aee3dab
tree0b3d7d1822beb32d335b0689bb04bb0a3a36f98c
parent3b24ece297afc8ee648f91dbbe890d8aaee7e3bc
parentf78ba0df02a9734740d7ccddbe315020f56852f6
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/engine.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/blender_sync.cpp
source/blender/blenkernel/intern/displist.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/view3d_view.c