Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 14 Apr 2018 12:34:21 +0000 (14:34 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 14 Apr 2018 12:34:21 +0000 (14:34 +0200)
commit36152afa7623943e578600cab1cd355efae1fe0e
tree1ab5391e4f20f8fbe08b5835885a78371435867d
parent35785ee7cbc84aad1d6633c9c4a59395ccd71f73
parent5ab77ab4ee445a6680dab5833dc251e2afe036c4
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/object.c