[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32987] trunk/blender/source/blender/ editors/interface/view2d_ops.c: bugfix #24573

Ton Roosendaal ton at blender.org
Wed Nov 10 17:22:20 CET 2010


Revision: 32987
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32987
Author:   ton
Date:     2010-11-10 17:22:19 +0100 (Wed, 10 Nov 2010)

Log Message:
-----------
bugfix #24573

View2d custom keymap to put zoom in RMB didn't work, the modal handler
still has a hardcoded check for mouse/keys. Fixed it for this case quickly,
added wiki todo and warning in code.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/view2d_ops.c

Modified: trunk/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d_ops.c	2010-11-10 15:10:54 UTC (rev 32986)
+++ trunk/blender/source/blender/editors/interface/view2d_ops.c	2010-11-10 16:22:19 UTC (rev 32987)
@@ -1002,7 +1002,8 @@
 		
 		/* apply zooming */
 		view_zoomdrag_apply(C, op);
-	} else if (ELEM(event->type, LEFTMOUSE, MIDDLEMOUSE)) {
+	} 
+	else if (ELEM3(event->type, LEFTMOUSE, MIDDLEMOUSE, RIGHTMOUSE)) { /* XXX needs modal keymap */
 		if (event->val==KM_RELEASE) {
 			/* for redo, store the overall deltas - need to respect zoom-locks here... */
 			if ((v2d->keepzoom & V2D_LOCKZOOM_X)==0)





More information about the Bf-blender-cvs mailing list