* Cleaned up naming of icon ID constants. This helps fix bad icons in the graph edito...

diff --git a/source/blender/editors/animation/anim_ipo_utils.c b/source/blender/editors/animation/anim_ipo_utils.c
index 84a18b64d6abd2d840e8a35bf24cdf2fe778f789..ae0b8435635ada6ac9596d905c36132a18c18b40 100644 (file)
--- a/source/blender/editors/animation/anim_ipo_utils.c
+++ b/source/blender/editors/animation/anim_ipo_utils.c
@@ -65,17 +65,17 @@ int geticon_anim_blocktype(short blocktype)
 {
        switch (blocktype) {
                case ID_OB:
-                       return ICON_OBJECT;
+                       return ICON_OBJECT_DATA;
                case ID_PO:
                        return ICON_POSE_HLT;
                case ID_KE:
-                       return ICON_SHAPEKEY;
+                       return ICON_SHAPEKEY_DATA;
                case ID_MA:
                        return ICON_MATERIAL;
                case ID_WO:
                        return ICON_WORLD;
                case ID_CU:
-                       return ICON_CURVE;
+                       return ICON_CURVE_DATA;
                case ID_CA:
                        return ICON_CAMERA;
                case ID_LA:

diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h
index c6a6c4241584c88f65f5f638ecb2a7930d3e9dc5..1b3c4f17ea324f86ad6ff9cb9ab6a8510b9065ed 100644 (file)
--- a/source/blender/editors/include/UI_resources.h
+++ b/source/blender/editors/include/UI_resources.h
@@ -179,7 +179,7 @@ typedef enum {
        ICON_BLANK061b,
        
        /* MODES */
-       ICON_OBJECTMODE,        // XXX fix this up
+       ICON_OBJECT_DATAMODE,   // XXX fix this up
        ICON_EDITMODE_HLT,
        ICON_FACESEL_HLT,
        ICON_VPAINT_HLT,
@@ -207,27 +207,27 @@ typedef enum {
        ICON_BLANK077b,
        
        /* DATA */
-       ICON_SCENE_DEHLT,
+       ICON_SCENE_DATA,
        ICON_RENDERLAYERS,
-       ICON_WORLD_DEHLT,
-       ICON_OBJECT,
-       ICON_MESH,
-       ICON_CURVE,
-       ICON_MBALL,
-       ICON_LATTICE,
-       ICON_LAMP_DEHLT,
-       ICON_MATERIAL_DEHLT,
-       ICON_TEXTURE_DEHLT,
-       ICON_IPO_DEHLT,
-       ICON_CAMERA_DEHLT,
+       ICON_WORLD_DATA,
+       ICON_OBJECT_DATA,
+       ICON_MESH_DATA,
+       ICON_CURVE_DATA,
+       ICON_MBALL_DATA,
+       ICON_LATTICE_DATA,
+       ICON_LAMP_DATA,
+       ICON_MATERIAL_DATA,
+       ICON_TEXTURE_DATA,
+       ICON_ANIM_DATA,
+       ICON_CAMERA_DATA,
        ICON_PARTICLE_DATA,
-       ICON_LIBRARY_DEHLT,
+       ICON_LIBRARY_DATA_DIRECT,
        ICON_GROUP,
-       ICON_ARMATURE,
-       ICON_POSE_DEHLT,
-       ICON_BONE_DEHLT,
+       ICON_ARMATURE_DATA,
+       ICON_POSE_DATA,
+       ICON_BONE_DATA,
        ICON_CONSTRAINT,
-       ICON_SHAPEKEY,
+       ICON_SHAPEKEY_DATA,
        ICON_VGROUP,
        ICON_BLANK079,
        ICON_PACKAGE,
@@ -235,8 +235,8 @@ typedef enum {
        ICON_BLANK079b,
        
        /* DATA */
-       ICON_BRUSH,
-       ICON_IMAGE_DEHLT,
+       ICON_BRUSH_DATA,
+       ICON_IMAGE_DATA,
        ICON_FILE,
        ICON_FCURVE,
        ICON_FONT,
@@ -249,7 +249,7 @@ typedef enum {
        ICON_BLANK080F,
        ICON_BLANK080,
        ICON_BLANK081,
-       ICON_LIBRARY_HLT,
+       ICON_LIBRARY_DATA_INDIRECT,
        ICON_BLANK082,
        ICON_BLANK083,
        ICON_BLANK084,

diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c
index 27b6ddd0f1e0f72281107c0b4d6a43d06d68aa50..d8f83eca7f07d628477d3c524149654e80ef0f6d 100644 (file)
--- a/source/blender/editors/interface/interface_utils.c
+++ b/source/blender/editors/interface/interface_utils.c
@@ -66,13 +66,13 @@ int UI_GetIconRNA(PointerRNA *ptr)
        StructRNA *rnatype= ptr->type;
 
        if(rnatype == &RNA_Scene)
-               return ICON_SCENE_DEHLT;
+               return ICON_SCENE_DATA;
        else if(rnatype == &RNA_World)
-               return ICON_WORLD;
+               return ICON_WORLD_DATA;
        else if(rnatype == &RNA_Object)
-               return ICON_OBJECT;
+               return ICON_OBJECT_DATA;
        else if(rnatype == &RNA_Mesh)
-               return ICON_MESH;
+               return ICON_MESH_DATA;
        else if(rnatype == &RNA_MeshVertex)
                return ICON_VERTEXSEL;
        else if(rnatype == &RNA_MeshEdge)
@@ -86,49 +86,49 @@ int UI_GetIconRNA(PointerRNA *ptr)
        else if(rnatype == &RNA_VertexGroupElement)
                return ICON_VGROUP;
        else if(rnatype == &RNA_Curve)
-               return ICON_CURVE;
+               return ICON_CURVE_DATA;
        else if(rnatype == &RNA_MetaBall)
-               return ICON_MBALL;
+               return ICON_MBALL_DATA;
        else if(rnatype == &RNA_MetaElement)
                return ICON_OUTLINER_DATA_META;
        else if(rnatype == &RNA_Lattice)
-               return ICON_LATTICE;
+               return ICON_LATTICE_DATA;
        else if(rnatype == &RNA_Armature)
-               return ICON_ARMATURE;
+               return ICON_ARMATURE_DATA;
        else if(rnatype == &RNA_Bone)
-               return ICON_BONE_DEHLT;
+               return ICON_BONE_DATA;
        else if(rnatype == &RNA_Camera)
-               return ICON_CAMERA;
+               return ICON_CAMERA_DATA;
        else if(rnatype == &RNA_LocalLamp)
-               return ICON_LAMP;
+               return ICON_LAMP_DATA;
        else if(rnatype == &RNA_AreaLamp)
-               return ICON_LAMP;
+               return ICON_LAMP_DATA;
        else if(rnatype == &RNA_SpotLamp)
-               return ICON_LAMP;
+               return ICON_LAMP_DATA;
        else if(rnatype == &RNA_SunLamp)
-               return ICON_LAMP;
+               return ICON_LAMP_DATA;
        else if(rnatype == &RNA_HemiLamp)
-               return ICON_LAMP;
+               return ICON_LAMP_DATA;
        else if(rnatype == &RNA_Lamp)
-               return ICON_LAMP;
+               return ICON_LAMP_DATA;
        else if(rnatype == &RNA_Group)
                return ICON_GROUP;
        else if(rnatype == &RNA_ParticleSystem)
-               return ICON_PARTICLES;
+               return ICON_PARTICLE_DATA;
        else if(rnatype == &RNA_ParticleSettings)
-               return ICON_PARTICLES;
+               return ICON_PARTICLE_DATA;
        else if(rnatype == &RNA_Material)
-               return ICON_MATERIAL;
+               return ICON_MATERIAL_DATA;
        else if(rnatype == &RNA_Texture)
-               return ICON_TEXTURE;
+               return ICON_TEXTURE_DATA;
        else if(rnatype == &RNA_TextureSlot)
-               return ICON_TEXTURE;
+               return ICON_TEXTURE_DATA;
        else if(rnatype == &RNA_WorldTextureSlot)
-               return ICON_TEXTURE;
+               return ICON_TEXTURE_DATA;
        else if(rnatype == &RNA_MaterialTextureSlot)
-               return ICON_TEXTURE;
+               return ICON_TEXTURE_DATA;
        else if(rnatype == &RNA_Image)
-               return ICON_TEXTURE;
+               return ICON_IMAGE_DATA;
        else if(rnatype == &RNA_Screen)
                return ICON_SPLITSCREEN;
        else if(rnatype == &RNA_NodeTree)
@@ -138,19 +138,19 @@ int UI_GetIconRNA(PointerRNA *ptr)
        else if(rnatype == &RNA_Sound)
                return ICON_SOUND;
        else if(rnatype == &RNA_Brush)
-               return ICON_BRUSH;
+               return ICON_BRUSH_DATA;
        else if(rnatype == &RNA_VectorFont)
                return ICON_FONT;
        else if(rnatype == &RNA_Library)
-               return ICON_LIBRARY_DEHLT;
+               return ICON_LIBRARY_DATA_DIRECT;
        else if(rnatype == &RNA_Action)
                return ICON_ACTION;
        else if(rnatype == &RNA_FCurve)
-               return ICON_IPO_DEHLT;
+               return ICON_ANIM_DATA;
        //else if(rnatype == &RNA_Ipo)
-       //      return ICON_IPO_DEHLT;
+       //      return ICON_ANIM_DATA;
        else if(rnatype == &RNA_Key)
-               return ICON_SHAPEKEY;
+               return ICON_SHAPEKEY_DATA;
        else if(rnatype == &RNA_Main)
                return ICON_BLENDER;
        else if(rnatype == &RNA_Struct)
@@ -182,11 +182,11 @@ int UI_GetIconRNA(PointerRNA *ptr)
        else if(rnatype == &RNA_SubsurfModifier)
                return ICON_MOD_SUBSURF;
        else if(rnatype == &RNA_ArmatureModifier)
-               return ICON_ARMATURE;
+               return ICON_MOD_ARMATURE;
        else if(rnatype == &RNA_LatticeModifier)
-               return ICON_LATTICE;
+               return ICON_MOD_LATTICE;
        else if(rnatype == &RNA_CurveModifier)
-               return ICON_CURVE;
+               return ICON_MOD_CURVE;
        else if(rnatype == &RNA_BuildModifier)
                return ICON_MOD_BUILD;
        else if(rnatype == &RNA_MirrorModifier)

diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c
index 94a83197f3698c5ef64e316cfbfedcae6ac36a6d..16b264154ce649b24c8e6425a8d36767f223d80d 100644 (file)
--- a/source/blender/editors/space_action/action_draw.c
+++ b/source/blender/editors/space_action/action_draw.c
@@ -473,9 +473,9 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
                                        
                                        /* icon depends on object-type */
                                        if (ob->type == OB_ARMATURE)
-                                               special= ICON_ARMATURE;
+                                               special= ICON_ARMATURE_DATA;
                                        else    
-                                               special= ICON_OBJECT;
+                                               special= ICON_OBJECT_DATA;
                                                
                                        /* only show expand if there are any channels */
                                        if (EXPANDED_OBJC(ob))
@@ -577,7 +577,7 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
                                        
                                        group = 4;
                                        indent = 1;
-                                       special = ICON_CURVE;
+                                       special = ICON_CURVE_DATA;
                                        
                                        if (FILTER_CUR_OBJD(cu))
                                                expand = ICON_TRIA_DOWN;

diff --git a/source/blender/editors/space_action/action_header.c b/source/blender/editors/space_action/action_header.c
index 918b54c2a32d33fd1f8c90f7c66eed0594cac0a4..9723a7f7b03961d4e8c41aaa441ff06fbaf77206 100644 (file)
--- a/source/blender/editors/space_action/action_header.c
+++ b/source/blender/editors/space_action/action_header.c
@@ -1676,13 +1676,13 @@ void action_header_buttons(const bContext *C, ARegion *ar)
                        xco += 5;
                        
                        uiBlockBeginAlign(block);
-                               uiDefIconButBitI(block, TOGN, ADS_FILTER_NOSCE, B_REDR, ICON_SCENE,     (short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Scene Animation");
-                               uiDefIconButBitI(block, TOGN, ADS_FILTER_NOWOR, B_REDR, ICON_WORLD,     (short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display World Animation");
-                               uiDefIconButBitI(block, TOGN, ADS_FILTER_NOSHAPEKEYS, B_REDR, ICON_EDIT,        (short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display ShapeKeys");
-                               uiDefIconButBitI(block, TOGN, ADS_FILTER_NOMAT, B_REDR, ICON_MATERIAL,  (short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Materials");
-                               uiDefIconButBitI(block, TOGN, ADS_FILTER_NOLAM, B_REDR, ICON_LAMP,      (short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Lamps");
-                               uiDefIconButBitI(block, TOGN, ADS_FILTER_NOCAM, B_REDR, ICON_CAMERA,    (short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Cameras");
-                               uiDefIconButBitI(block, TOGN, ADS_FILTER_NOCUR, B_REDR, ICON_CURVE,     (short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Curves");
+                               uiDefIconButBitI(block, TOGN, ADS_FILTER_NOSCE, B_REDR, ICON_SCENE_DATA,        (short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Scene Animation");
+                               uiDefIconButBitI(block, TOGN, ADS_FILTER_NOWOR, B_REDR, ICON_WORLD_DATA,        (short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display World Animation");
+                               uiDefIconButBitI(block, TOGN, ADS_FILTER_NOSHAPEKEYS, B_REDR, ICON_SHAPEKEY_DATA,       (short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display ShapeKeys");
+                               uiDefIconButBitI(block, TOGN, ADS_FILTER_NOMAT, B_REDR, ICON_MATERIAL_DATA,     (short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Materials");
+                               uiDefIconButBitI(block, TOGN, ADS_FILTER_NOLAM, B_REDR, ICON_LAMP_DATA, (short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Lamps");
+                               uiDefIconButBitI(block, TOGN, ADS_FILTER_NOCAM, B_REDR, ICON_CAMERA_DATA,       (short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Cameras");
+                               uiDefIconButBitI(block, TOGN, ADS_FILTER_NOCUR, B_REDR, ICON_CURVE_DATA,        (short)(xco+=XIC),yco,XIC,YIC, &(saction->ads.filterflag), 0, 0, 0, 0, "Display Curves");
                        uiBlockEndAlign(block);
                        xco += 30;
                }

diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c
index abccb1aa7337df12e966d9ef5db361b1879ce33d..515083c9fece6e3ce8366374d77269ea42d2654b 100644 (file)
--- a/source/blender/editors/space_buttons/buttons_header.c
+++ b/source/blender/editors/space_buttons/buttons_header.c
@@ -138,10 +138,10 @@ void buttons_header_buttons(const bContext *C, ARegion *ar)
        uiBlockBeginAlign(block);
        uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,     ICON_GAME,                      xco, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)CONTEXT_LOGIC, 0, 0, "Logic (F4) ");
        uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,     ICON_SCRIPT,            xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)CONTEXT_SCRIPT, 0, 0, "Script ");
-       uiDefIconButS(block, ROW, B_BUTSPREVIEW,        ICON_MATERIAL_DEHLT,xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)CONTEXT_SHADING, 0, 0, "Shading (F5) ");
-       uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,     ICON_OBJECT,            xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)CONTEXT_OBJECT, 0, 0, "Object (F7) ");
+       uiDefIconButS(block, ROW, B_BUTSPREVIEW,        ICON_MATERIAL_DATA,xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)CONTEXT_SHADING, 0, 0, "Shading (F5) ");
+       uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,     ICON_OBJECT_DATA,               xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)CONTEXT_OBJECT, 0, 0, "Object (F7) ");
        uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,     ICON_EDIT,                      xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)CONTEXT_EDITING, 0, 0, "Editing (F9) ");
-       uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,     ICON_SCENE_DEHLT,       xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)CONTEXT_SCENE, 0, 0, "Scene (F10) ");
+       uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,     ICON_SCENE_DATA,        xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)CONTEXT_SCENE, 0, 0, "Scene (F10) ");
        
        xco+= XIC;
        
@@ -158,7 +158,7 @@ void buttons_header_buttons(const bContext *C, ARegion *ar)
                        break;
                case CONTEXT_OBJECT:
                        uiBlockBeginAlign(block);
-                       uiDefIconButC(block, ROW, B_CONTEXT_SWITCH,             ICON_OBJECT,    xco+=XIC, yco, XIC, YIC, &(sbuts->tab[CONTEXT_OBJECT]), 1.0, (float)TAB_OBJECT_OBJECT, 0, 0, "Object buttons ");
+                       uiDefIconButC(block, ROW, B_CONTEXT_SWITCH,             ICON_OBJECT_DATA,       xco+=XIC, yco, XIC, YIC, &(sbuts->tab[CONTEXT_OBJECT]), 1.0, (float)TAB_OBJECT_OBJECT, 0, 0, "Object buttons ");
                        uiDefIconButC(block, ROW, B_CONTEXT_SWITCH,             ICON_PHYSICS,   xco+=XIC, yco, XIC, YIC, &(sbuts->tab[CONTEXT_OBJECT]), 1.0, (float)TAB_OBJECT_PHYSICS, 0, 0, "Physics buttons");
                        uiDefIconButC(block, ROW, B_CONTEXT_SWITCH,             ICON_PARTICLES, xco+=XIC, yco, XIC, YIC, &(sbuts->tab[CONTEXT_OBJECT]), 1.0, (float)TAB_OBJECT_PARTICLE, 0, 0, "Particle buttons");
                        

diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c
index 7b04f0793e8c84ca8f3dee575d6e23651a0b0488..1dc14b83eb7eed0819dff5ce0d33b1715ecbb526 100644 (file)
--- a/source/blender/editors/space_graph/graph_draw.c
+++ b/source/blender/editors/space_graph/graph_draw.c
@@ -835,9 +835,9 @@ void graph_draw_channel_names(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
                                        
                                        /* icon depends on object-type */
                                        if (ob->type == OB_ARMATURE)
-                                               special= ICON_ARMATURE;
+                                               special= ICON_ARMATURE_DATA;
                                        else    
-                                               special= ICON_OBJECT;
+                                               special= ICON_OBJECT_DATA;
                                                
                                        /* only show expand if there are any channels */
                                        if (EXPANDED_OBJC(ob))
@@ -872,7 +872,7 @@ void graph_draw_channel_names(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
                                        
                                        group = 4;
                                        indent= 1;
-                                       special= ICON_IPO_DEHLT;
+                                       special= ICON_ANIM_DATA;
                                        
                                        if (EXPANDED_DRVD(adt))
                                                expand= ICON_TRIA_DOWN;
@@ -955,7 +955,7 @@ void graph_draw_channel_names(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
                                        
                                        group = 4;
                                        indent = 1;
-                                       special = ICON_CURVE;
+                                       special = ICON_CURVE_DATA;
                                        
                                        if (FILTER_CUR_OBJD(cu))
                                                expand = ICON_TRIA_DOWN;

diff --git a/source/blender/editors/space_graph/graph_header.c b/source/blender/editors/space_graph/graph_header.c
index e4768e2f59f6f0b5640b2b331a434f975ff7c6c1..cbd5372b0e20a74ada3f8a3cec48433d009da6e4 100644 (file)
--- a/source/blender/editors/space_graph/graph_header.c
+++ b/source/blender/editors/space_graph/graph_header.c
@@ -185,13 +185,13 @@ void graph_header_buttons(const bContext *C, ARegion *ar)
                xco += 5;
                
                uiBlockBeginAlign(block);
-                       uiDefIconButBitI(block, TOGN, ADS_FILTER_NOSCE, B_REDR, ICON_SCENE,     (short)(xco+=XIC),yco,XIC,YIC, &(sipo->ads->filterflag), 0, 0, 0, 0, "Display Scene Animation");
-                               uiDefIconButBitI(block, TOGN, ADS_FILTER_NOWOR, B_REDR, ICON_WORLD,     (short)(xco+=XIC),yco,XIC,YIC, &(sipo->ads->filterflag), 0, 0, 0, 0, "Display World Animation");
-                       uiDefIconButBitI(block, TOGN, ADS_FILTER_NOSHAPEKEYS, B_REDR, ICON_EDIT,        (short)(xco+=XIC),yco,XIC,YIC, &(sipo->ads->filterflag), 0, 0, 0, 0, "Display ShapeKeys");
-                       uiDefIconButBitI(block, TOGN, ADS_FILTER_NOMAT, B_REDR, ICON_MATERIAL,  (short)(xco+=XIC),yco,XIC,YIC, &(sipo->ads->filterflag), 0, 0, 0, 0, "Display Materials");
-                       uiDefIconButBitI(block, TOGN, ADS_FILTER_NOLAM, B_REDR, ICON_LAMP,      (short)(xco+=XIC),yco,XIC,YIC, &(sipo->ads->filterflag), 0, 0, 0, 0, "Display Lamps");
-                       uiDefIconButBitI(block, TOGN, ADS_FILTER_NOCAM, B_REDR, ICON_CAMERA,    (short)(xco+=XIC),yco,XIC,YIC, &(sipo->ads->filterflag), 0, 0, 0, 0, "Display Cameras");
-                       uiDefIconButBitI(block, TOGN, ADS_FILTER_NOCUR, B_REDR, ICON_CURVE,     (short)(xco+=XIC),yco,XIC,YIC, &(sipo->ads->filterflag), 0, 0, 0, 0, "Display Curves");
+                       uiDefIconButBitI(block, TOGN, ADS_FILTER_NOSCE, B_REDR, ICON_SCENE_DATA,        (short)(xco+=XIC),yco,XIC,YIC, &(sipo->ads->filterflag), 0, 0, 0, 0, "Display Scene Animation");
+                               uiDefIconButBitI(block, TOGN, ADS_FILTER_NOWOR, B_REDR, ICON_WORLD_DATA,        (short)(xco+=XIC),yco,XIC,YIC, &(sipo->ads->filterflag), 0, 0, 0, 0, "Display World Animation");
+                       uiDefIconButBitI(block, TOGN, ADS_FILTER_NOSHAPEKEYS, B_REDR, ICON_SHAPEKEY_DATA,       (short)(xco+=XIC),yco,XIC,YIC, &(sipo->ads->filterflag), 0, 0, 0, 0, "Display ShapeKeys");
+                       uiDefIconButBitI(block, TOGN, ADS_FILTER_NOMAT, B_REDR, ICON_MATERIAL_DATA,     (short)(xco+=XIC),yco,XIC,YIC, &(sipo->ads->filterflag), 0, 0, 0, 0, "Display Materials");
+                       uiDefIconButBitI(block, TOGN, ADS_FILTER_NOLAM, B_REDR, ICON_LAMP_DATA, (short)(xco+=XIC),yco,XIC,YIC, &(sipo->ads->filterflag), 0, 0, 0, 0, "Display Lamps");
+                       uiDefIconButBitI(block, TOGN, ADS_FILTER_NOCAM, B_REDR, ICON_CAMERA_DATA,       (short)(xco+=XIC),yco,XIC,YIC, &(sipo->ads->filterflag), 0, 0, 0, 0, "Display Cameras");
+                       uiDefIconButBitI(block, TOGN, ADS_FILTER_NOCUR, B_REDR, ICON_CURVE_DATA,        (short)(xco+=XIC),yco,XIC,YIC, &(sipo->ads->filterflag), 0, 0, 0, 0, "Display Curves");
                uiBlockEndAlign(block);
                xco += 30;
        }

diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 841600d7262d1b36d30eacfe8689ec531b3c106b..bf96d1c38aae2b344484f4989b94992cf4ee365d 100644 (file)
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -852,7 +852,7 @@ static char *node_image_type_pup(void)
        str[0]= 0;
        
        a= sprintf(str, "Image Type %%t|");
-       a+= sprintf(str+a, "  Image %%x%d %%i%d|", IMA_SRC_FILE, ICON_IMAGE_DEHLT);
+       a+= sprintf(str+a, "  Image %%x%d %%i%d|", IMA_SRC_FILE, ICON_IMAGE_DATA);
        a+= sprintf(str+a, "  Movie %%x%d %%i%d|", IMA_SRC_MOVIE, ICON_SEQUENCE);
        a+= sprintf(str+a, "  Sequence %%x%d %%i%d|", IMA_SRC_SEQUENCE, ICON_IMAGE_COL);
        a+= sprintf(str+a, "  Generated %%x%d %%i%d", IMA_SRC_GENERATED, ICON_BLANK1);
@@ -920,7 +920,7 @@ static int node_composit_buts_image(uiBlock *block, bNodeTree *ntree, bNode *nod
                        Image *ima= (Image *)node->id;
                        short xmin= (short)butr->xmin, xmax= (short)butr->xmax;
                        short width= xmax - xmin - 45;
-                       short icon= ICON_IMAGE_DEHLT;
+                       short icon= ICON_IMAGE_DATA;
                        
                        if(ima->source==IMA_SRC_MOVIE) icon= ICON_SEQUENCE;
                        else if(ima->source==IMA_SRC_SEQUENCE) icon= ICON_IMAGE_COL;
@@ -1086,7 +1086,7 @@ static int node_composit_buts_renderlayers(uiBlock *block, bNodeTree *ntree, bNo
                /* browse button layer */
                strp= scene_layer_menu(node->id?(Scene *)node->id:scene);
                if(node->id)
-                       bt= uiDefIconTextButS(block, MENU, B_NODE_EXEC, ICON_SCENE_DEHLT, strp, 
+                       bt= uiDefIconTextButS(block, MENU, B_NODE_EXEC, ICON_SCENE_DATA, strp, 
                                  butr->xmin+20, butr->ymin, (butr->xmax-butr->xmin)-40, 19, 
                                  &node->custom1, 0, 0, 0, 0, "Choose Render Layer");
                else

diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 8c9d2d12c862da476ef4f07ce8bea469cf5389ea..28deb705b7b7c4c357c54677bf4b87fff80447d5 100644 (file)
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -674,7 +674,7 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
                if(node->flag & (NODE_ACTIVE_ID|NODE_DO_OUTPUT))
                        icon_id= ICON_MATERIAL;
                else
-                       icon_id= ICON_MATERIAL_DEHLT;
+                       icon_id= ICON_MATERIAL_DATA;
                iconofs-= 18.0f;
                glEnable(GL_BLEND);
                UI_icon_draw_aspect_blended(iconofs, rct->ymax-NODE_DY+2, icon_id, snode->aspect, -60);

diff --git a/source/blender/editors/space_node/node_header.c b/source/blender/editors/space_node/node_header.c
index e8f39a94c768fc2ea0e88d358d24cd8b645d7383..d2e7df55e5429e1b25b18d3215e6122477533fca 100644 (file)
--- a/source/blender/editors/space_node/node_header.c
+++ b/source/blender/editors/space_node/node_header.c
@@ -732,13 +732,13 @@ void node_header_buttons(const bContext *C, ARegion *ar)
        
        /* main type choosing */
        uiBlockBeginAlign(block);
-       uiDefIconButI(block, ROW, B_REDR, ICON_MATERIAL_DEHLT, xco,yco,XIC,YIC-2,
+       uiDefIconButI(block, ROW, B_REDR, ICON_MATERIAL_DATA, xco,yco,XIC,YIC-2,
                                  &(snode->treetype), 2.0f, 0.0f, 0.0f, 0.0f, "Material Nodes");
        xco+= XIC;
-       uiDefIconButI(block, ROW, B_REDR, ICON_IMAGE_DEHLT, xco,yco,XIC,YIC-2,
+       uiDefIconButI(block, ROW, B_REDR, ICON_IMAGE_DATA, xco,yco,XIC,YIC-2,
                                  &(snode->treetype), 2.0f, 1.0f, 0.0f, 0.0f, "Composite Nodes");
        xco+= XIC;
-       uiDefIconButI(block, ROW, B_REDR, ICON_TEXTURE_DEHLT, xco,yco,XIC,YIC-2,
+       uiDefIconButI(block, ROW, B_REDR, ICON_TEXTURE_DATA, xco,yco,XIC,YIC-2,
                                  &(snode->treetype), 2.0f, 2.0f, 0.0f, 0.0f, "Texture Nodes");
        xco+= 2*XIC;
        uiBlockEndAlign(block);

diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c
index fa63dfb82f32c114754e3fa1a9c3d6f8b45246b6..3fb640e34ba1b945885065a3f61013a68a7ced65 100644 (file)
--- a/source/blender/editors/space_outliner/outliner.c
+++ b/source/blender/editors/space_outliner/outliner.c
@@ -3376,7 +3376,7 @@ static void tselem_draw_icon(float x, float y, TreeStoreElem *tselem, TreeElemen
        if(tselem->type) {
                switch( tselem->type) {
                        case TSE_ANIM_DATA:
-                               UI_icon_draw(x, y, ICON_IPO_DEHLT); break; // xxx
+                               UI_icon_draw(x, y, ICON_ANIM_DATA); break; // xxx
                        case TSE_NLA:
                                UI_icon_draw(x, y, ICON_NLA); break;
                        case TSE_NLA_ACTION:
@@ -3385,13 +3385,13 @@ static void tselem_draw_icon(float x, float y, TreeStoreElem *tselem, TreeElemen
                                UI_icon_draw(x, y, ICON_VGROUP); break;
                        case TSE_BONE:
                        case TSE_EBONE:
-                               UI_icon_draw(x, y, ICON_BONE_DEHLT); break;
+                               UI_icon_draw(x, y, ICON_BONE_DATA); break;
                        case TSE_CONSTRAINT_BASE:
                                UI_icon_draw(x, y, ICON_CONSTRAINT); break;
                        case TSE_MODIFIER_BASE:
                                UI_icon_draw(x, y, ICON_MODIFIER); break;
                        case TSE_LINKED_OB:
-                               UI_icon_draw(x, y, ICON_OBJECT); break;
+                               UI_icon_draw(x, y, ICON_OBJECT_DATA); break;
                        case TSE_LINKED_PSYS:
                                UI_icon_draw(x, y, ICON_PARTICLES); break;
                        case TSE_MODIFIER:
@@ -3441,9 +3441,9 @@ static void tselem_draw_icon(float x, float y, TreeStoreElem *tselem, TreeElemen
                        case TSE_SCRIPT_BASE:
                                UI_icon_draw(x, y, ICON_TEXT); break;
                        case TSE_POSE_BASE:
-                               UI_icon_draw(x, y, ICON_ARMATURE); break;
+                               UI_icon_draw(x, y, ICON_ARMATURE_DATA); break;
                        case TSE_POSE_CHANNEL:
-                               UI_icon_draw(x, y, ICON_BONE_DEHLT); break;
+                               UI_icon_draw(x, y, ICON_BONE_DATA); break;
                        case TSE_PROXY:
                                UI_icon_draw(x, y, ICON_GHOST); break;
                        case TSE_R_LAYER_BASE:
@@ -3451,9 +3451,9 @@ static void tselem_draw_icon(float x, float y, TreeStoreElem *tselem, TreeElemen
                        case TSE_R_LAYER:
                                UI_icon_draw(x, y, ICON_RENDER_RESULT); break;
                        case TSE_LINKED_LAMP:
-                               UI_icon_draw(x, y, ICON_LAMP_DEHLT); break;
+                               UI_icon_draw(x, y, ICON_LAMP_DATA); break;
                        case TSE_LINKED_MAT:
-                               UI_icon_draw(x, y, ICON_MATERIAL_DEHLT); break;
+                               UI_icon_draw(x, y, ICON_MATERIAL_DATA); break;
                        case TSE_POSEGRP_BASE:
                                UI_icon_draw(x, y, ICON_VERTEXSEL); break;
                        case TSE_SEQUENCE:
@@ -3471,10 +3471,10 @@ static void tselem_draw_icon(float x, float y, TreeStoreElem *tselem, TreeElemen
                                        UI_icon_draw(x, y, ICON_PARTICLES);
                                break;
                        case TSE_SEQ_STRIP:
-                               UI_icon_draw(x, y, ICON_LIBRARY_DEHLT);
+                               UI_icon_draw(x, y, ICON_LIBRARY_DATA_DIRECT);
                                break;
                        case TSE_SEQUENCE_DUP:
-                               UI_icon_draw(x, y, ICON_OBJECT);
+                               UI_icon_draw(x, y, ICON_OBJECT_DATA);
                                break;
                        case TSE_RNA_STRUCT:
                                UI_icon_draw(x, y, UI_GetIconRNA(&te->rnaptr));
@@ -3512,7 +3512,7 @@ static void tselem_draw_icon(float x, float y, TreeStoreElem *tselem, TreeElemen
        else {
                switch( GS(tselem->id->name)) {
                        case ID_SCE:
-                               UI_icon_draw(x, y, ICON_SCENE_DEHLT); break;
+                               UI_icon_draw(x, y, ICON_SCENE_DATA); break;
                        case ID_ME:
                                UI_icon_draw(x, y, ICON_OUTLINER_DATA_MESH); break;
                        case ID_CU:
@@ -3524,11 +3524,11 @@ static void tselem_draw_icon(float x, float y, TreeStoreElem *tselem, TreeElemen
                        case ID_LA:
                                UI_icon_draw(x, y, ICON_OUTLINER_DATA_LAMP); break;
                        case ID_MA:
-                               UI_icon_draw(x, y, ICON_MATERIAL_DEHLT); break;
+                               UI_icon_draw(x, y, ICON_MATERIAL_DATA); break;
                        case ID_TE:
-                               UI_icon_draw(x, y, ICON_TEXTURE_DEHLT); break;
+                               UI_icon_draw(x, y, ICON_TEXTURE_DATA); break;
                        case ID_IM:
-                               UI_icon_draw(x, y, ICON_IMAGE_DEHLT); break;
+                               UI_icon_draw(x, y, ICON_IMAGE_DATA); break;
                        case ID_SO:
                                UI_icon_draw(x, y, ICON_SPEAKER); break;
                        case ID_AR:
@@ -3536,9 +3536,9 @@ static void tselem_draw_icon(float x, float y, TreeStoreElem *tselem, TreeElemen
                        case ID_CA:
                                UI_icon_draw(x, y, ICON_OUTLINER_DATA_CAMERA); break;
                        case ID_KE:
-                               UI_icon_draw(x, y, ICON_SHAPEKEY); break;
+                               UI_icon_draw(x, y, ICON_SHAPEKEY_DATA); break;
                        case ID_WO:
-                               UI_icon_draw(x, y, ICON_WORLD_DEHLT); break;
+                               UI_icon_draw(x, y, ICON_WORLD_DATA); break;
                        case ID_AC:
                                UI_icon_draw(x, y, ICON_ACTION); break;
                        case ID_NLA:
@@ -3548,7 +3548,7 @@ static void tselem_draw_icon(float x, float y, TreeStoreElem *tselem, TreeElemen
                        case ID_GR:
                                UI_icon_draw(x, y, ICON_GROUP); break;
                        case ID_LI:
-                               UI_icon_draw(x, y, ICON_LIBRARY_DEHLT); break;
+                               UI_icon_draw(x, y, ICON_LIBRARY_DATA_DIRECT); break;
                }
        }
 }
@@ -3689,9 +3689,9 @@ static void outliner_draw_tree_element(Scene *scene, ARegion *ar, SpaceOops *soo
                if(tselem->type==0 && tselem->id->lib) {
                        glPixelTransferf(GL_ALPHA_SCALE, 0.5f);
                        if(tselem->id->flag & LIB_INDIRECT)
-                               UI_icon_draw((float)startx+offsx, (float)*starty+2, ICON_LIBRARY_HLT);
+                               UI_icon_draw((float)startx+offsx, (float)*starty+2, ICON_LIBRARY_DATA_INDIRECT);
                        else
-                               UI_icon_draw((float)startx+offsx, (float)*starty+2, ICON_LIBRARY_DEHLT);
+                               UI_icon_draw((float)startx+offsx, (float)*starty+2, ICON_LIBRARY_DATA_DIRECT);
                        glPixelTransferf(GL_ALPHA_SCALE, 1.0f);
                        offsx+= OL_X;
                }               

diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index c8747899e6f7fcbf881fb1b27e968bc82f4866fb..f0b8587ba5641f71700fd6439328a5b44da1ccc4 100644 (file)
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -103,7 +103,7 @@
  * This can be cleaned when I make some new 'mode' icons.
  */
 
-#define V3D_OBJECTMODE_SEL                     ICON_OBJECT
+#define V3D_OBJECTMODE_SEL                     ICON_OBJECT_DATA
 #define V3D_EDITMODE_SEL                       ICON_EDITMODE_HLT
 #define V3D_SCULPTMODE_SEL                     ICON_SCULPTMODE_HLT
 #define V3D_FACESELECT_SEL                     ICON_FACESEL_HLT        /* this is not a mode anymore - just a switch */
@@ -4823,9 +4823,9 @@ static char *view3d_modeselect_pup(Scene *scene)
        str += sprintf(str, "Mode: %%t");
        
        if(ob)
-               str += sprintf(str, formatstr, "Object Mode", V3D_OBJECTMODE_SEL, ICON_OBJECT);
+               str += sprintf(str, formatstr, "Object Mode", V3D_OBJECTMODE_SEL, ICON_OBJECT_DATA);
        else
-               str += sprintf(str, formatstr, " ", V3D_OBJECTMODE_SEL, ICON_OBJECT);
+               str += sprintf(str, formatstr, " ", V3D_OBJECTMODE_SEL, ICON_OBJECT_DATA);
        
        if(ob==NULL) return string;