* More icon naming updates
authorMatt Ebb <matt@mke3.net>
Wed, 18 Feb 2009 06:03:14 +0000 (06:03 +0000)
committerMatt Ebb <matt@mke3.net>
Wed, 18 Feb 2009 06:03:14 +0000 (06:03 +0000)
source/blender/editors/space_action/action_draw.c
source/blender/editors/space_graph/graph_draw.c

index 16b264154ce649b24c8e6425a8d36767f223d80d..87fdfe4ffdb4aafd7fca2ca051fe40bb1dbb2cbf 100644 (file)
@@ -451,7 +451,7 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
                                        group= 4;
                                        indent= 0;
                                        
-                                       special= ICON_SCENE;
+                                       special= ICON_SCENE_DATA;
                                                
                                        /* only show expand if there are any channels */
                                        if (EXPANDED_SCEC(sce))
@@ -510,7 +510,7 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
                                        
                                        group = 4;
                                        indent = 1;
-                                       special = ICON_MATERIAL;
+                                       special = ICON_MATERIAL_DATA;
                                        
                                        if (FILTER_MAT_OBJC(ob))
                                                expand = ICON_TRIA_DOWN;
@@ -528,7 +528,7 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
                                        
                                        group = 0;
                                        indent = 0;
-                                       special = ICON_MATERIAL;
+                                       special = ICON_MATERIAL_DATA;
                                        offset = 21;
                                        
                                        if (FILTER_MAT_OBJD(ma))
@@ -545,7 +545,7 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
                                        
                                        group = 4;
                                        indent = 1;
-                                       special = ICON_LAMP;
+                                       special = ICON_LAMP_DATA;
                                        
                                        if (FILTER_LAM_OBJD(la))
                                                expand = ICON_TRIA_DOWN;
@@ -561,7 +561,7 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
                                        
                                        group = 4;
                                        indent = 1;
-                                       special = ICON_CAMERA;
+                                       special = ICON_CAMERA_DATA;
                                        
                                        if (FILTER_CAM_OBJD(ca))
                                                expand = ICON_TRIA_DOWN;
@@ -593,7 +593,7 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
                                        
                                        group = 4;
                                        indent = 1;
-                                       special = ICON_EDIT; // XXX 
+                                       special = ICON_SHAPEKEY_DATA; // XXX 
                                        
                                        if (FILTER_SKE_OBJD(key))       
                                                expand = ICON_TRIA_DOWN;
@@ -610,7 +610,7 @@ void draw_channel_names(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
                                        
                                        group = 4;
                                        indent = 1;
-                                       special = ICON_WORLD;
+                                       special = ICON_WORLD_DATA;
                                        
                                        if (FILTER_WOR_SCED(wo))        
                                                expand = ICON_TRIA_DOWN;
index 1dc14b83eb7eed0819dff5ce0d33b1715ecbb526..ec8ef17ab4fa8a9164a4c27f178b320e501ddc1e 100644 (file)
@@ -813,7 +813,7 @@ void graph_draw_channel_names(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
                                        group= 4;
                                        indent= 0;
                                        
-                                       special= ICON_SCENE;
+                                       special= ICON_SCENE_DATA;
                                        
                                        /* only show expand if there are any channels */
                                        if (EXPANDED_SCEC(sce))
@@ -888,7 +888,7 @@ void graph_draw_channel_names(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
                                        
                                        group = 4;
                                        indent = 1;
-                                       special = ICON_MATERIAL;
+                                       special = ICON_MATERIAL_DATA;
                                        
                                        if (FILTER_MAT_OBJC(ob))
                                                expand = ICON_TRIA_DOWN;
@@ -906,7 +906,7 @@ void graph_draw_channel_names(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
                                        
                                        group = 0;
                                        indent = 0;
-                                       special = ICON_MATERIAL;
+                                       special = ICON_MATERIAL_DATA;
                                        offset = 21;
                                        
                                        if (FILTER_MAT_OBJD(ma))
@@ -923,7 +923,7 @@ void graph_draw_channel_names(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
                                        
                                        group = 4;
                                        indent = 1;
-                                       special = ICON_LAMP;
+                                       special = ICON_LAMP_DATA;
                                        
                                        if (FILTER_LAM_OBJD(la))
                                                expand = ICON_TRIA_DOWN;
@@ -939,7 +939,7 @@ void graph_draw_channel_names(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
                                        
                                        group = 4;
                                        indent = 1;
-                                       special = ICON_CAMERA;
+                                       special = ICON_CAMERA_DATA;
                                        
                                        if (FILTER_CAM_OBJD(ca))
                                                expand = ICON_TRIA_DOWN;
@@ -971,7 +971,7 @@ void graph_draw_channel_names(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
                                        
                                        group = 4;
                                        indent = 1;
-                                       special = ICON_EDIT;
+                                       special = ICON_SHAPEKEY_DATA;
                                        
                                        if (FILTER_SKE_OBJD(key))       
                                                expand = ICON_TRIA_DOWN;
@@ -988,7 +988,7 @@ void graph_draw_channel_names(bAnimContext *ac, SpaceIpo *sipo, ARegion *ar)
                                        
                                        group = 4;
                                        indent = 1;
-                                       special = ICON_WORLD;
+                                       special = ICON_WORLD_DATA;
                                        
                                        if (FILTER_WOR_SCED(wo))        
                                                expand = ICON_TRIA_DOWN;