[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11922] trunk/blender/source/blender: Bugfix #7020

[Ton Roosendaal]

Revision: 11922
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11922
Author:   ton
Date:     2007-09-02 19:47:03 +0200 (Sun, 02 Sep 2007)

Log Message:
-----------
Bugfix #7020

Buttons window, Object context, Anim Settings panel, "draw key"
did not work. Bug since year zero...

Modified Paths:
--------------
    trunk/blender/source/blender/include/butspace.h
    trunk/blender/source/blender/src/buttons_object.c

Modified: trunk/blender/source/blender/include/butspace.h
===================================================================
--- trunk/blender/source/blender/include/butspace.h	2007-09-02 17:41:25 UTC (rev 11921)
+++ trunk/blender/source/blender/include/butspace.h	2007-09-02 17:47:03 UTC (rev 11922)
@@ -280,6 +280,7 @@
 #define B_FLUIDSIM_MAKEPART	    1453
 
 #define B_GROUP_RELINK			1460
+#define B_OBJECT_IPOFLAG		1461
 
 /* *********************** */
 #define B_WORLDBUTS		1600

Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c	2007-09-02 17:41:25 UTC (rev 11921)
+++ trunk/blender/source/blender/src/buttons_object.c	2007-09-02 17:47:03 UTC (rev 11922)
@@ -2141,6 +2141,11 @@
 		allqueue(REDRAWVIEW3D, 0);
 		break;
 		
+	case B_OBJECT_IPOFLAG:
+		if(ob->ipo) ob->ipo->showkey= (ob->ipoflag & OB_DRAWKEY)?1:0;
+		allqueue(REDRAWVIEW3D, 0);
+		break;
+		
 	default:
 		if(event>=B_SELEFFECT && event<B_SELEFFECT+MAX_EFFECT) {
 			int a=B_SELEFFECT;
@@ -2321,7 +2326,7 @@
 	uiDefButS(block, ROW,REDRAWVIEW3D,"Z",		298,180,19,19, &ob->upflag, 13.0, 2.0, 0, 0, "Specify the axis that points up");
 	
 	uiBlockBeginAlign(block);
-	uiDefButBitS(block, TOG, OB_DRAWKEY, REDRAWVIEW3D, "Draw Key",		24,155,71,19, &ob->ipoflag, 0, 0, 0, 0, "Draw object as key position");
+	uiDefButBitS(block, TOG, OB_DRAWKEY, B_OBJECT_IPOFLAG, "Draw Key",		24,155,71,19, &ob->ipoflag, 0, 0, 0, 0, "Draw object as key position");
 	uiDefButBitS(block, TOG, OB_DRAWKEYSEL, REDRAWVIEW3D, "Draw Key Sel",	97,155,81,19, &ob->ipoflag, 0, 0, 0, 0, "Limit the drawing of object keys");
 	uiDefButBitS(block, TOG, OB_POWERTRACK, REDRAWVIEW3D, "Powertrack",		180,155,78,19, &ob->transflag, 0, 0, 0, 0, "Switch objects rotation off");
 	uiDefButBitS(block, TOG, PARSLOW, 0, "SlowPar",					260,155,56,19, &ob->partype, 0, 0, 0, 0, "Create a delay in the parent relationship");