[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40934] trunk/blender/source/blender/ editors/interface/interface_handlers.c: fix for drag-n-drop ID' s for renaming (own fault when fixing #24016)

Campbell Barton ideasman42 at gmail.com
Tue Oct 11 12:59:53 CEST 2011


Revision: 40934
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40934
Author:   campbellbarton
Date:     2011-10-11 10:59:52 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
fix for drag-n-drop ID's for renaming (own fault when fixing #24016)

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	2011-10-11 09:32:57 UTC (rev 40933)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2011-10-11 10:59:52 UTC (rev 40934)
@@ -4429,7 +4429,7 @@
 		/* check prevval because of modal operators [#24016],
 		 * modifier check is to allow Ctrl+C for copy.
 		 * if this causes other problems, remove this check and suffer the bug :) - campbell */
-		(event->prevval != KM_PRESS || ISKEYMODIFIER(event->prevtype))
+		((event->prevval != KM_PRESS) || (ISKEYMODIFIER(event->prevtype)) || (event->type == EVT_DROP))
 	) {
 		/* handle copy-paste */
 		if(ELEM(event->type, CKEY, VKEY) && event->val==KM_PRESS && (event->ctrl || event->oskey)) {




More information about the Bf-blender-cvs mailing list