Bugfix #4466 (half)
authorTon Roosendaal <ton@blender.org>
Sun, 25 Jun 2006 12:30:33 +0000 (12:30 +0000)
committerTon Roosendaal <ton@blender.org>
Sun, 25 Jun 2006 12:30:33 +0000 (12:30 +0000)
Object 'active shape' was only 1 byte in object. OK. Let's sacrifice another
byte for that then!

source/blender/makesdna/DNA_object_types.h
source/blender/src/buttons_editing.c
source/blender/src/drawipo.c

index 782b7fdd6cb66a08787d16e649e84c6c979894f5..e8573f3da4a6e45a2e5beb14acee06b5aefaffee 100644 (file)
@@ -193,9 +193,11 @@ typedef struct Object {
        struct Group *dup_group;        /* object duplicator for group */
        
        short fluidsimFlag;                     /* NT toggle fluidsim participation on/off */
-       char shapenr, shapeflag;        /* current shape key for menu or pinned, flag for pinning */
+       short pad3;
+       short shapenr, shapeflag;       /* current shape key for menu or pinned, flag for pinning */
        float smoothresh;                       /* smoothresh is phong interpolation ray_shadow correction in render */
-
+       int pad4;
+       
        struct FluidsimSettings *fluidsimSettings; /* if fluidsim enabled, store additional settings */
   
        struct DerivedMesh *derivedDeform, *derivedFinal;
index d227bff640cfef464dd28d2b34d61c4d908e1978..81f5cacfad3b5b0e610b572f1d8e1040acfa04de 100644 (file)
@@ -1593,11 +1593,11 @@ static void editing_panel_shapes(Object *ob)
 
        uiBlockBeginAlign(block);
        if(ob->shapeflag & OB_SHAPE_LOCK) icon= ICON_PIN_HLT; else icon= ICON_PIN_DEHLT;
-       uiDefIconButBitC(block, TOG, OB_SHAPE_LOCK, B_LOCKKEY, icon, 10,150,25,20, &ob->shapeflag, 0, 0, 0, 0, "Always show the current Shape for this Object");
+       uiDefIconButBitS(block, TOG, OB_SHAPE_LOCK, B_LOCKKEY, icon, 10,150,25,20, &ob->shapeflag, 0, 0, 0, 0, "Always show the current Shape for this Object");
        uiSetButLock(G.obedit==ob, "Unable to perform in EditMode");
        uiDefIconBut(block, BUT, B_PREVKEY, ICON_TRIA_LEFT,             35,150,20,20, NULL, 0, 0, 0, 0, "Previous Shape Key");
        strp= make_key_menu(key);
-       uiDefButC(block, MENU, B_SETKEY, strp,                                  55,150,20,20, &ob->shapenr, 0, 0, 0, 0, "Browses existing choices or adds NEW");
+       uiDefButS(block, MENU, B_SETKEY, strp,                                  55,150,20,20, &ob->shapenr, 0, 0, 0, 0, "Browses existing choices or adds NEW");
        MEM_freeN(strp);
        uiDefIconBut(block, BUT, B_NEXTKEY, ICON_TRIA_RIGHT,    75,150,20,20, NULL, 0, 0, 0, 0, "Next Shape Key");
        uiClearButLock();
index ead44dcf8ba1444c92661bb3585196219c792ffc..2689bb9ae664bc605075ed5109652dc64c463102 100644 (file)
@@ -1049,7 +1049,7 @@ static void draw_ipobuts(SpaceIpo *sipo)
        if(ob && sipo->blocktype==ID_KE) {
                int icon;
                if(ob->shapeflag & OB_SHAPE_LOCK) icon= ICON_PIN_HLT; else icon= ICON_PIN_DEHLT;
-               uiDefIconButBitC(block, TOG, OB_SHAPE_LOCK, B_SETKEY, icon, 
+               uiDefIconButBitS(block, TOG, OB_SHAPE_LOCK, B_SETKEY, icon, 
                                                 v2d->mask.xmax+18,y,25,20, &ob->shapeflag, 0, 0, 0, 0, "Always show the current Shape for this Object");
                y-= IPOBUTY;
        }