[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31780] trunk/blender/source/blender: bugfix [#23641] enable/disable switch of "Limit" Constraints are inverting

[Campbell Barton]

Revision: 31780
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31780
Author:   campbellbarton
Date:     2010-09-06 09:26:21 +0200 (Mon, 06 Sep 2010)

Log Message:
-----------
bugfix [#23641] enable/disable switch of "Limit" Constraints are inverting

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/makesrna/intern/rna_constraint.c

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2010-09-06 06:48:19 UTC (rev 31779)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2010-09-06 07:26:21 UTC (rev 31780)
@@ -957,6 +957,11 @@
 		show_upbut= ((prev_proxylock == 0) && (con->prev));
 		show_downbut= (con->next) ? 1 : 0;
 		
+		/* enabled */
+		uiBlockSetEmboss(block, UI_EMBOSSN);
+		uiItemR(row, &ptr, "mute", 0, "", (con->flag & CONSTRAINT_OFF) ? ICON_MUTE_IPO_ON : ICON_MUTE_IPO_OFF);
+		uiBlockSetEmboss(block, UI_EMBOSS);
+		
 		uiLayoutSetOperatorContext(row, WM_OP_INVOKE_DEFAULT);
 		
 		/* up/down */
@@ -970,9 +975,6 @@
 			uiBlockEndAlign(block);
 		}
 		
-		/* enabled */
-		uiItemR(row, &ptr, "mute", 0, "", 0);
-		
 		/* Close 'button' - emboss calls here disable drawing of 'button' behind X */
 		uiBlockSetEmboss(block, UI_EMBOSSN);
 		uiItemO(row, "", ICON_X, "CONSTRAINT_OT_delete");

Modified: trunk/blender/source/blender/makesrna/intern/rna_constraint.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_constraint.c	2010-09-06 06:48:19 UTC (rev 31779)
+++ trunk/blender/source/blender/makesrna/intern/rna_constraint.c	2010-09-06 07:26:21 UTC (rev 31780)
@@ -1941,8 +1941,8 @@
 
 	/* flags */
 	prop= RNA_def_property(srna, "mute", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CONSTRAINT_OFF);
-	RNA_def_property_ui_text(prop, "Enabled", "Enable/Disable Constraint");
+	RNA_def_property_boolean_sdna(prop, NULL, "flag", CONSTRAINT_OFF);
+	RNA_def_property_ui_text(prop, "Disable", "Enable/Disable Constraint");
 	
 	prop= RNA_def_property(srna, "show_expanded", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", CONSTRAINT_EXPAND);