[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23409] trunk/blender/source/blender/ editors/interface/interface_templates.c: Fix part of #19307: modifier cage button not working as a toggle button.

[Brecht Van Lommel]

Revision: 23409
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23409
Author:   blendix
Date:     2009-09-21 23:03:50 +0200 (Mon, 21 Sep 2009)

Log Message:
-----------
Fix part of #19307: modifier cage button not working as a toggle button.

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

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2009-09-21 20:50:11 UTC (rev 23408)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2009-09-21 21:03:50 UTC (rev 23409)
@@ -405,10 +405,12 @@
 static void modifiers_setOnCage(bContext *C, void *ob_v, void *md_v)
 {
 	Object *ob = ob_v;
-	ModifierData *md;
-	
+	ModifierData *md= md_v;
 	int i, cageIndex = modifiers_getCageIndex(ob, NULL );
 
+	/* undo button operation */
+	md->mode ^= eModifierMode_OnCage;
+
 	for(i = 0, md=ob->modifiers.first; md; ++i, md=md->next) {
 		if(md == md_v) {
 			if(i >= cageIndex)
@@ -517,9 +519,10 @@
 		/* XXX uiBlockSetEmboss(block, UI_EMBOSSR); */
 
 		if(ob->type==OB_MESH && modifier_couldBeCage(md) && index<=lastCageIndex) {
-
 			/* XXX uiBlockSetCol(block, color); */
-			but = uiDefIconBut(block, BUT, 0, ICON_MESH_DATA, 0, 0, 16, 20, NULL, 0.0, 0.0, 0.0, 0.0, "Apply modifier to editing cage during Editmode");
+			but = uiDefIconButBitI(block, TOG, eModifierMode_OnCage, 0, ICON_MESH_DATA, 0, 0, 16, 20, &md->mode, 0.0, 0.0, 0.0, 0.0, "Apply modifier to editing cage during Editmode");
+			if(index < cageIndex)
+				uiButSetFlag(but, UI_BUT_DISABLED);
 			uiButSetFunc(but, modifiers_setOnCage, ob, md);
 			uiBlockEndAlign(block);
 			/* XXX uiBlockSetCol(block, TH_AUTO); */