[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37043] trunk/blender/source/blender/ editors/interface: Button value reset:

[Brecht Van Lommel]

Revision: 37043
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37043
Author:   blendix
Date:     2011-05-31 09:56:38 +0000 (Tue, 31 May 2011)
Log Message:
-----------
Button value reset:
* shortcut key changed from numpad 0 to delete.
* fix missing undo push, now it calls the operator.

Patch by Damir Prebeg, thanks!

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

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c	2011-05-31 09:55:50 UTC (rev 37042)
+++ trunk/blender/source/blender/editors/interface/interface.c	2011-05-31 09:56:38 UTC (rev 37043)
@@ -1670,15 +1670,12 @@
 
 void ui_set_but_default(bContext *C, uiBut *but, short all)
 {
-	/* if there is a valid property that is editable... */
-	if (but->rnapoin.data && but->rnaprop && RNA_property_editable(&but->rnapoin, but->rnaprop)) {
-		int index = (all)? -1 : but->rnaindex;
-		
-		if(RNA_property_reset(&but->rnapoin, but->rnaprop, index)) {
-			/* perform updates required for this property */
-			RNA_property_update(C, &but->rnapoin, but->rnaprop);
-		}
-	}
+	PointerRNA ptr;
+
+	WM_operator_properties_create(&ptr, "UI_OT_reset_default_button");
+	RNA_boolean_set(&ptr, "all", all);
+	WM_operator_name_call(C, "UI_OT_reset_default_button", WM_OP_EXEC_DEFAULT, &ptr);
+	WM_operator_properties_free(&ptr);
 }
 
 static double soft_range_round_up(double value, double max)

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2011-05-31 09:55:50 UTC (rev 37042)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2011-05-31 09:56:38 UTC (rev 37043)
@@ -4442,8 +4442,8 @@
 		}
 		/* reset to default */
 		/* XXX hardcoded keymap check.... */
-		else if(ELEM(event->type, ZEROKEY, PAD0) && event->val == KM_PRESS) {
-			/* ctrl-0 = for arrays, only the active one gets done (vs whole array for just 0) */
+		else if(ELEM(event->type, DELKEY, PADPERIOD) && event->val == KM_PRESS) {
+			/* del - reset active button; ctrl+del - reset a whole array*/
 			if (!(ELEM3(but->type, HSVCIRCLE, HSVCUBE, HISTOGRAM)))
 				ui_set_but_default(C, but, !event->ctrl);
 		}