[Bf-blender-cvs] [c3dad79] master: Stickies: Remove redundant fixes

Julian Eisel noreply at git.blender.org
Sun Apr 5 20:05:01 CEST 2015


Commit: c3dad7953afccd440c63c60b5ce34f147178d826
Author: Julian Eisel
Date:   Sun Apr 5 20:04:37 2015 +0200
Branches: master
https://developer.blender.org/rBc3dad7953afccd440c63c60b5ce34f147178d826

Stickies: Remove redundant fixes

Those fixes aren't needed anymore due to
776bfa64a53191b6f6aba107449be9353b7a2bee

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

M	source/blender/editors/interface/interface_eyedropper.c
M	source/blender/editors/mesh/editmesh_extrude.c

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

diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c
index 96f9b87..f5847a9 100644
--- a/source/blender/editors/interface/interface_eyedropper.c
+++ b/source/blender/editors/interface/interface_eyedropper.c
@@ -277,10 +277,6 @@ static int eyedropper_modal(bContext *C, wmOperator *op, const wmEvent *event)
 			eyedropper_cancel(C, op);
 			return OPERATOR_CANCELLED;
 		case LEFTMOUSE:
-			/* two release events are sent on KM_CLICK, so ignore second one */
-			if (event->click_type == KM_CLICK) {
-				break;
-			}
 			if (event->val == KM_RELEASE) {
 				if (eye->accum_tot == 0) {
 					eyedropper_color_sample(C, eye, event->x, event->y);
diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c
index 3c9c8a4..5c7efcc 100644
--- a/source/blender/editors/mesh/editmesh_extrude.c
+++ b/source/blender/editors/mesh/editmesh_extrude.c
@@ -511,9 +511,6 @@ static int edbm_dupli_extrude_cursor_invoke(bContext *C, wmOperator *op, const w
 	bool done = false;
 	bool use_proj;
 
-	if (ELEM(event->click_type, KM_CLICK, KM_HOLD))
-		return OPERATOR_CANCELLED;
-
 	em_setup_viewcontext(C, &vc);
 
 	ED_view3d_init_mats_rv3d(vc.obedit, vc.rv3d);




More information about the Bf-blender-cvs mailing list