[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51705] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Bugfix #24016

[Ton Roosendaal]

Revision: 51705
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51705
Author:   ton
Date:     2012-10-28 12:20:38 +0000 (Sun, 28 Oct 2012)
Log Message:
-----------
Bugfix #24016

Removed dubious code for checking CTRL+C CTRL+V on buttons.
This made copy/paste fail if you keep the modifier key holding.

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	2012-10-28 12:08:36 UTC (rev 51704)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2012-10-28 12:20:38 UTC (rev 51705)
@@ -4933,14 +4933,11 @@
 	if (but->flag & UI_BUT_DISABLED)
 		return WM_UI_HANDLER_CONTINUE;
 
-	if ((data->state == BUTTON_STATE_HIGHLIGHT) &&
-	    /* 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->type == EVT_DROP)))
+	if ((data->state == BUTTON_STATE_HIGHLIGHT) || (event->type == EVT_DROP))
 	{
 		/* 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');
 			return WM_UI_HANDLER_BREAK;
 		}