Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 11 Aug 2017 00:33:39 +0000 (10:33 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 11 Aug 2017 00:33:39 +0000 (10:33 +1000)
commitd1328feeb125328615bcf832cbc82d9f9a18e023
tree9243fcdd057cb7cbc710393158a7c15c41459919
parentc4201e57f36e7a5bcb711bd1a92d5b334cd40dff
parent0398ee10a1b727c63b344db3d6c8d78f6bbfd633
Merge branch 'master' into blender2.8
12 files changed:
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_sync.cpp
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/transform/transform_snap_object.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/wm_files.h
tests/python/CMakeLists.txt