Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 26 Sep 2017 12:45:42 +0000 (22:45 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 26 Sep 2017 12:45:42 +0000 (22:45 +1000)
commitd6800c1a81501cf37f5f5fae45beb5566a48b44d
treeadb5eee35f237ce6746fbb73a5f2a2fcb851f9e3
parent30f9cd710b3a2edad5a13a67bbe7c89a53785dca
parent482b665e021956ea9b5643e0664ba289fc101552
Merge branch 'master' into blender2.8
source/blender/editors/transform/transform_manipulator.c
source/blender/makesdna/DNA_scene_types.h