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)
1  2 
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

Simple merge