Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 4 May 2017 22:23:59 +0000 (08:23 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 4 May 2017 22:23:59 +0000 (08:23 +1000)
1  2 
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/editors/space_view3d/drawobject.c