Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 6 Apr 2017 02:26:55 +0000 (12:26 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 6 Apr 2017 02:26:55 +0000 (12:26 +1000)
commit9f72580d0784b2bf55743ab44d5f95039f282b5e
treec64f3933e0346379ce5e86f24aed843ab0c875ac
parent13f77de21463a4406edf1e387bb4a7b9735c5a72
parentf74b4a010d4b0cc51eb9ecddeab0f7d91b31ec94
Merge branch 'master' into blender2.8
source/blender/editors/transform/transform_manipulator.c