Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 24 Apr 2017 12:11:05 +0000 (22:11 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 24 Apr 2017 12:11:05 +0000 (22:11 +1000)
1  2 
CMakeLists.txt
make.bat
source/blender/blenkernel/intern/idprop.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/object_dupli.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_relations.c
source/blender/gpu/intern/gpu_draw.c
source/blender/modifiers/intern/MOD_surfacedeform.c
tests/python/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
diff --cc make.bat
Simple merge
Simple merge
Simple merge