[Bf-blender-cvs] [a645535] wiggly-widgets: Remove redundant transform flag for transform manipulator

[Julian Eisel]

Commit: a6455356e73adc14cb2e594ac480e44eba0a4653
Author: Julian Eisel
Date:   Tue Sep 8 15:59:46 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBa6455356e73adc14cb2e594ac480e44eba0a4653

Remove redundant transform flag for transform manipulator

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

M	source/blender/editors/transform/transform.h
M	source/blender/editors/transform/transform_generics.c

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

diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 79bb0fe..cdd260b 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -484,8 +484,6 @@ typedef struct TransInfo {
 	/* alternative transformation. used to add offset to tracking markers */
 #define T_ALT_TRANSFORM		(1 << 24)
 
-#define T_USE_WIDGET		(1 << 24)
-
 /* TransInfo->modifiers */
 #define	MOD_CONSTRAINT_SELECT	0x01
 #define	MOD_PRECISION			0x02
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 83e43bd..a08abb8 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1192,15 +1192,8 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 		t->view = v3d;
 		t->animtimer = (animscreen) ? animscreen->animtimer : NULL;
 
-		if (op && ((prop = RNA_struct_find_property(op->ptr, "use_widget_input")) &&
-		    RNA_property_is_set(op->ptr, prop)))
-		{
-			if (RNA_property_boolean_get(op->ptr, prop))
-				t->flag |= T_USE_WIDGET;
-		}
-
 		/* turn manipulator off during transform */
-		if ((t->flag & T_MODAL) && !(t->flag & T_USE_WIDGET)) {
+		if (t->flag & T_MODAL) {
 			t->twtype = v3d->twtype;
 			v3d->twtype = 0;
 		}
@@ -1481,7 +1474,7 @@ void postTrans(bContext *C, TransInfo *t)
 	else if (t->spacetype == SPACE_VIEW3D) {
 		View3D *v3d = t->sa->spacedata.first;
 		/* restore manipulator */
-		if ((t->flag & T_MODAL) && !(t->flag & T_USE_WIDGET)) {
+		if (t->flag & T_MODAL) {
 			v3d->twtype = t->twtype;
 		}
 	}