[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32439] trunk/blender/source/blender/ editors/interface/interface_handlers.c: bugfix [#24030] Grease Pencil + Driver keys

Campbell Barton ideasman42 at gmail.com
Wed Oct 13 05:17:59 CEST 2010


Revision: 32439
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32439
Author:   campbellbarton
Date:     2010-10-13 05:17:58 +0200 (Wed, 13 Oct 2010)

Log Message:
-----------
bugfix [#24030] Grease Pencil + Driver keys

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

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-10-13 01:58:09 UTC (rev 32438)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-10-13 03:17:58 UTC (rev 32439)
@@ -4266,7 +4266,7 @@
 	if(but->flag & UI_BUT_DISABLED)
 		return WM_UI_HANDLER_CONTINUE;
 
-	if(data->state == BUTTON_STATE_HIGHLIGHT) {
+	if(data->state == BUTTON_STATE_HIGHLIGHT && event->prevval != KM_PRESS) { /* check prevval because of modal operators [#24016] */
 		/* handle copy-paste */
 		if(ELEM(event->type, CKEY, VKEY) && event->val==KM_PRESS && (event->ctrl || event->oskey)) {
 			ui_but_copy_paste(C, but, data, (event->type == CKEY)? 'c': 'v');





More information about the Bf-blender-cvs mailing list