Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2009-05-04 11:04:48 +0400
committerMatt Ebb <matt@mke3.net>2009-05-04 11:04:48 +0400
commit387df32933996850145487ddba07a3bd3c25d627 (patch)
tree9ad498f355985163b59d99264e752870f75c4e3c /source/blender/editors/interface/interface_utils.c
parent2e93dc4037b815a97c9b9d03fe28742e01458e43 (diff)
* Icon updates and fixes
* Made the buttons space listen to and update for new active objects * Cleaned up the Add Object menu
Diffstat (limited to 'source/blender/editors/interface/interface_utils.c')
-rw-r--r--source/blender/editors/interface/interface_utils.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c
index 239eb042a64..8f3053f5312 100644
--- a/source/blender/editors/interface/interface_utils.c
+++ b/source/blender/editors/interface/interface_utils.c
@@ -90,7 +90,7 @@ int UI_GetIconRNA(PointerRNA *ptr)
else if(rnatype == &RNA_Curve)
return ICON_CURVE_DATA;
else if(rnatype == &RNA_MetaBall)
- return ICON_MBALL_DATA;
+ return ICON_META_DATA;
else if(rnatype == &RNA_MetaElement)
return ICON_OUTLINER_DATA_META;
else if(rnatype == &RNA_Lattice)
@@ -142,7 +142,7 @@ int UI_GetIconRNA(PointerRNA *ptr)
else if(rnatype == &RNA_Brush)
return ICON_BRUSH_DATA;
else if(rnatype == &RNA_VectorFont)
- return ICON_FONT;
+ return ICON_FONT_DATA;
else if(rnatype == &RNA_Library)
return ICON_LIBRARY_DATA_DIRECT;
else if(rnatype == &RNA_Action)
@@ -204,7 +204,7 @@ int UI_GetIconRNA(PointerRNA *ptr)
else if(rnatype == &RNA_BooleanModifier)
return ICON_MOD_BOOLEAN;
else if(rnatype == &RNA_ParticleInstanceModifier)
- return ICON_MOD_PARTICLEINSTANCE;
+ return ICON_MOD_PARTICLES;
else if(rnatype == &RNA_ParticleSystemModifier)
return ICON_MOD_PARTICLES;
else if(rnatype == &RNA_EdgeSplitModifier)
@@ -233,6 +233,8 @@ int UI_GetIconRNA(PointerRNA *ptr)
return ICON_MOD_CLOTH;
else if(rnatype == &RNA_ExplodeModifier)
return ICON_MOD_EXPLODE;
+ else if(rnatype == &RNA_CollisionModifier)
+ return ICON_MOD_PHYSICS;
else
return ICON_DOT;
}