[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19027] branches/blender2.5/blender/source /blender/editors: * Cleaned up naming of icon ID constants.
Matt Ebb
matt at mke3.net
Wed Feb 18 06:54:38 CET 2009
Revision: 19027
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19027
Author: broken
Date: 2009-02-18 06:54:37 +0100 (Wed, 18 Feb 2009)
Log Message:
-----------
* Cleaned up naming of icon ID constants. This helps fix bad icons in the graph editor among others.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/animation/anim_ipo_utils.c
branches/blender2.5/blender/source/blender/editors/include/UI_resources.h
branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c
branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c
branches/blender2.5/blender/source/blender/editors/space_action/action_header.c
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_header.c
branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c
branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
Modified: branches/blender2.5/blender/source/blender/editors/animation/anim_ipo_utils.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_ipo_utils.c 2009-02-18 05:49:51 UTC (rev 19026)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_ipo_utils.c 2009-02-18 05:54:37 UTC (rev 19027)
@@ -65,17 +65,17 @@
{
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:
Modified: branches/blender2.5/blender/source/blender/editors/include/UI_resources.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/UI_resources.h 2009-02-18 05:49:51 UTC (rev 19026)
+++ branches/blender2.5/blender/source/blender/editors/include/UI_resources.h 2009-02-18 05:54:37 UTC (rev 19027)
@@ -179,7 +179,7 @@
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 @@
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 @@
ICON_BLANK079b,
/* DATA */
- ICON_BRUSH,
- ICON_IMAGE_DEHLT,
+ ICON_BRUSH_DATA,
+ ICON_IMAGE_DATA,
ICON_FILE,
ICON_FCURVE,
ICON_FONT,
@@ -249,7 +249,7 @@
ICON_BLANK080F,
ICON_BLANK080,
ICON_BLANK081,
- ICON_LIBRARY_HLT,
+ ICON_LIBRARY_DATA_INDIRECT,
ICON_BLANK082,
ICON_BLANK083,
ICON_BLANK084,
Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c 2009-02-18 05:49:51 UTC (rev 19026)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c 2009-02-18 05:54:37 UTC (rev 19027)
@@ -66,13 +66,13 @@
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 @@
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 @@
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 @@
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)
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:49:51 UTC (rev 19026)
+++ branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c 2009-02-18 05:54:37 UTC (rev 19027)
@@ -473,9 +473,9 @@
/* 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 @@
group = 4;
indent = 1;
- special = ICON_CURVE;
+ special = ICON_CURVE_DATA;
if (FILTER_CUR_OBJD(cu))
expand = ICON_TRIA_DOWN;
Modified: branches/blender2.5/blender/source/blender/editors/space_action/action_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_action/action_header.c 2009-02-18 05:49:51 UTC (rev 19026)
+++ branches/blender2.5/blender/source/blender/editors/space_action/action_header.c 2009-02-18 05:54:37 UTC (rev 19027)
@@ -1676,13 +1676,13 @@
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");
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list