Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 30 Jun 2017 03:46:53 +0000 (13:46 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 30 Jun 2017 03:46:53 +0000 (13:46 +1000)
1  2 
source/blender/blenkernel/intern/object_dupli.c
source/blender/editors/space_outliner/outliner_tree.c
source/blender/editors/transform/transform.c