Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 29 Nov 2017 10:30:03 +0000 (21:30 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 29 Nov 2017 10:32:16 +0000 (21:32 +1100)
commit28048f75ce42b370c76cc62a6b8b5de14586fcd6
tree0a7d2aa0735e3b2c2c65a205e4663db16547eafc
parent69d33ecdec0d131ede1ed488fc1cf16689c07284
parente32cfb0743d9b4da08403f9fd33abd1cadbd0299
Merge branch 'master' into blender2.8
source/blender/python/intern/CMakeLists.txt
source/blender/python/intern/bpy.c
source/blender/python/intern/bpy_interface.c
source/blender/python/intern/bpy_library_load.c
source/blender/python/intern/bpy_rna.c
source/blender/python/intern/bpy_rna_manipulator.c