[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41527] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Fix #29155: Inconsistency with 0 and Del hotkeys

Sergey Sharybin g.ulairi at gmail.com
Fri Nov 4 16:53:13 CET 2011


Revision: 41527
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41527
Author:   nazgul
Date:     2011-11-04 15:53:12 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Fix #29155: Inconsistency with 0 and Del hotkeys

Use del key to reset values in widgets like color selection and histogram.

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-11-04 15:46:15 UTC (rev 41526)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2011-11-04 15:53:12 UTC (rev 41527)
@@ -3306,7 +3306,7 @@
 			return WM_UI_HANDLER_BREAK;
 		}
 		/* XXX hardcoded keymap check.... */
-		else if (ELEM(event->type, ZEROKEY, PAD0) && event->val == KM_PRESS) {
+		else if (event->type == DELKEY && event->val == KM_PRESS) {
 			if (but->a1==UI_GRAD_V_ALT){
 				int len;
 				
@@ -3489,7 +3489,7 @@
 			return WM_UI_HANDLER_BREAK;
 		}
 		/* XXX hardcoded keymap check.... */
-		else if (ELEM(event->type, ZEROKEY, PAD0) && event->val == KM_PRESS) {
+		else if (event->type == DELKEY && event->val == KM_PRESS) {
 			int len;
 			
 			/* reset only saturation */
@@ -3938,7 +3938,7 @@
 			return WM_UI_HANDLER_BREAK;
 		}
 		/* XXX hardcoded keymap check.... */
-		else if (ELEM(event->type, ZEROKEY, PAD0) && event->val == KM_PRESS) {
+		else if (event->type == DELKEY && event->val == KM_PRESS) {
 			Histogram *hist = (Histogram *)but->poin;
 			hist->ymax = 1.f;
 			
@@ -4021,7 +4021,7 @@
 			return WM_UI_HANDLER_BREAK;
 		}
 		/* XXX hardcoded keymap check.... */
-		else if (ELEM(event->type, ZEROKEY, PAD0) && event->val == KM_PRESS) {
+		else if (event->type == DELKEY && event->val == KM_PRESS) {
 			Scopes *scopes = (Scopes *)but->poin;
 			scopes->wavefrm_yfac = 1.f;
 




More information about the Bf-blender-cvs mailing list