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)
commitbc347f6015635c4dbb93266f59a214b2050a8c72
tree8a41f6371af942adb8fa752fa42ad2f8107bcb2b
parentcdb07ff30e860f3fe9066d21f9405dc02dd8b2ad
parent9c2bbfb6ce90007a11f0fc4b2a1afa7d2eab5039
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/object_dupli.c
source/blender/editors/space_outliner/outliner_tree.c
source/blender/editors/transform/transform.c