[Bf-blender-cvs] [134e927965c] blender2.8: Manipulator: remove unused event hack

Campbell Barton noreply at git.blender.org
Thu Aug 24 09:01:49 CEST 2017


Commit: 134e927965c9871df8a9e13806f1cd48f4d43f16
Author: Campbell Barton
Date:   Thu Aug 24 12:02:08 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB134e927965c9871df8a9e13806f1cd48f4d43f16

Manipulator: remove unused event hack

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

M	source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
M	source/blender/windowmanager/wm_event_types.h

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

diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
index 4ace8695555..6f322933e2a 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
@@ -366,9 +366,6 @@ static int manipulator_tweak_modal(bContext *C, wmOperator *op, const wmEvent *e
 		mpr->type->modal(C, mpr, event, mtweak->flag);
 	}
 
-	/* Ugly hack to send manipulator events */
-	((wmEvent *)event)->type = EVT_MANIPULATOR_UPDATE;
-
 	/* always return PASS_THROUGH so modal handlers
 	 * with manipulators attached can update */
 	return OPERATOR_PASS_THROUGH;
diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h
index 9d34bc24e6c..5ebaa9bc3e9 100644
--- a/source/blender/windowmanager/wm_event_types.h
+++ b/source/blender/windowmanager/wm_event_types.h
@@ -338,9 +338,6 @@ enum {
 	EVT_MODAL_MAP         = 0x5022,
 	EVT_DROP              = 0x5023,
 	EVT_BUT_CANCEL        = 0x5024,
-
-	/* could become manipulator callback */
-	EVT_MANIPULATOR_UPDATE     = 0x5025,
 	/* ********** End of Blender internal events. ********** */
 };



More information about the Bf-blender-cvs mailing list