[Bf-blender-cvs] [2dd84c9570c] custom-manipulators: 3D Manipulator: add back protected flags check

Campbell Barton noreply at git.blender.org
Fri Apr 7 15:04:16 CEST 2017


Commit: 2dd84c9570c54b5061eca1f55854674b65cfb9b1
Author: Campbell Barton
Date:   Fri Apr 7 23:01:20 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB2dd84c9570c54b5061eca1f55854674b65cfb9b1

3D Manipulator: add back protected flags check

This used to be a separate pass

===================================================================

M	source/blender/editors/transform/transform_manipulator.c

===================================================================

diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index 91aaa5da0e9..e12f1b4286a 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -921,6 +921,7 @@ static int calc_manipulator_stats(const bContext *C)
 				if (ob == NULL)
 					ob = base->object;
 				calc_tw_center(scene, base->object->obmat[3]);
+				protectflag_to_drawflags(base->object->protectflag, &rv3d->twdrawflag);
 				totsel++;
 			}
 		}




More information about the Bf-blender-cvs mailing list