[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19028] branches/blender2.5/blender/source /blender/editors: * More icon naming updates

[Matt Ebb]

Revision: 19028
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19028
Author:   broken
Date:     2009-02-18 07:03:14 +0100 (Wed, 18 Feb 2009)

Log Message:
-----------
* More icon naming updates

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c
    branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c

Modified: branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c	2009-02-18 05:54:37 UTC (rev 19027)
+++ branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c	2009-02-18 06:03:14 UTC (rev 19028)
@@ -451,7 +451,7 @@
 					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 @@
 					
 					group = 4;
 					indent = 1;
-					special = ICON_MATERIAL;
+					special = ICON_MATERIAL_DATA;
 					
 					if (FILTER_MAT_OBJC(ob))
 						expand = ICON_TRIA_DOWN;
@@ -528,7 +528,7 @@
 					
 					group = 0;
 					indent = 0;
-					special = ICON_MATERIAL;
+					special = ICON_MATERIAL_DATA;
 					offset = 21;
 					
 					if (FILTER_MAT_OBJD(ma))
@@ -545,7 +545,7 @@
 					
 					group = 4;
 					indent = 1;
-					special = ICON_LAMP;
+					special = ICON_LAMP_DATA;
 					
 					if (FILTER_LAM_OBJD(la))
 						expand = ICON_TRIA_DOWN;
@@ -561,7 +561,7 @@
 					
 					group = 4;
 					indent = 1;
-					special = ICON_CAMERA;
+					special = ICON_CAMERA_DATA;
 					
 					if (FILTER_CAM_OBJD(ca))
 						expand = ICON_TRIA_DOWN;
@@ -593,7 +593,7 @@
 					
 					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 @@
 					
 					group = 4;
 					indent = 1;
-					special = ICON_WORLD;
+					special = ICON_WORLD_DATA;
 					
 					if (FILTER_WOR_SCED(wo))	
 						expand = ICON_TRIA_DOWN;

Modified: branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c	2009-02-18 05:54:37 UTC (rev 19027)
+++ branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c	2009-02-18 06:03:14 UTC (rev 19028)
@@ -813,7 +813,7 @@
 					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 @@
 					
 					group = 4;
 					indent = 1;
-					special = ICON_MATERIAL;
+					special = ICON_MATERIAL_DATA;
 					
 					if (FILTER_MAT_OBJC(ob))
 						expand = ICON_TRIA_DOWN;
@@ -906,7 +906,7 @@
 					
 					group = 0;
 					indent = 0;
-					special = ICON_MATERIAL;
+					special = ICON_MATERIAL_DATA;
 					offset = 21;
 					
 					if (FILTER_MAT_OBJD(ma))
@@ -923,7 +923,7 @@
 					
 					group = 4;
 					indent = 1;
-					special = ICON_LAMP;
+					special = ICON_LAMP_DATA;
 					
 					if (FILTER_LAM_OBJD(la))
 						expand = ICON_TRIA_DOWN;
@@ -939,7 +939,7 @@
 					
 					group = 4;
 					indent = 1;
-					special = ICON_CAMERA;
+					special = ICON_CAMERA_DATA;
 					
 					if (FILTER_CAM_OBJD(ca))
 						expand = ICON_TRIA_DOWN;
@@ -971,7 +971,7 @@
 					
 					group = 4;
 					indent = 1;
-					special = ICON_EDIT;
+					special = ICON_SHAPEKEY_DATA;
 					
 					if (FILTER_SKE_OBJD(key))	
 						expand = ICON_TRIA_DOWN;
@@ -988,7 +988,7 @@
 					
 					group = 4;
 					indent = 1;
-					special = ICON_WORLD;
+					special = ICON_WORLD_DATA;
 					
 					if (FILTER_WOR_SCED(wo))	
 						expand = ICON_TRIA_DOWN;