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)
commit1c2b5430cafa1cecf051632465693d9aa5079ce6
tree459430c55816dc81f22409e267ae38234570d407
parentef746be9826ee87ced68f27c81ec6fbf6bb7140f
parent57bcc19bb389e682d14032398138966329deb52a
Merge branch 'master' into blender2.8
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