UI/RNA:

* Added an icon entry to RNA structs, instead of the UI_GetIconRNA
  function, to keep code together a bit more and make the lookup
  faster.

1 files changed, 1 insertions, 181 deletions

diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c
index 76247258a71..564ae2c0205 100644
--- a/source/blender/editors/interface/interface_utils.c
+++ b/source/blender/editors/interface/interface_utils.c
@@ -65,186 +65,6 @@
 
 /*************************** RNA Utilities ******************************/
 
-int UI_GetIconRNA(PointerRNA *ptr)
-{
-	StructRNA *rnatype= ptr->type;
-
-	if(rnatype == &RNA_Scene)
-		return ICON_SCENE_DATA;
-	else if(rnatype == &RNA_World)
-		return ICON_WORLD_DATA;
-	else if(rnatype == &RNA_Object)
-		return ICON_OBJECT_DATA;
-	else if(rnatype == &RNA_Mesh)
-		return ICON_MESH_DATA;
-	else if(rnatype == &RNA_MeshVertex)
-		return ICON_VERTEXSEL;
-	else if(rnatype == &RNA_MeshEdge)
-		return ICON_EDGESEL;
-	else if(rnatype == &RNA_MeshFace)
-		return ICON_FACESEL;
-	else if(rnatype == &RNA_MeshTextureFace)
-		return ICON_FACESEL_HLT;
-	else if(rnatype == &RNA_VertexGroup)
-		return ICON_GROUP_VERTEX;
-	else if(rnatype == &RNA_VertexGroupElement)
-		return ICON_GROUP_VERTEX;
-	else if(rnatype == &RNA_Curve)
-		return ICON_CURVE_DATA;
-	else if(rnatype == &RNA_MetaBall)
-		return ICON_META_DATA;
-	else if(rnatype == &RNA_MetaElement)
-		return ICON_OUTLINER_DATA_META;
-	else if(rnatype == &RNA_Lattice)
-		return ICON_LATTICE_DATA;
-	else if(rnatype == &RNA_Armature)
-		return ICON_ARMATURE_DATA;
-	else if(rnatype == &RNA_Bone)
-		return ICON_BONE_DATA;
-	else if(rnatype == &RNA_Camera)
-		return ICON_CAMERA_DATA;
-	else if(rnatype == &RNA_LocalLamp)
-		return ICON_LAMP_DATA;
-	else if(rnatype == &RNA_AreaLamp)
-		return ICON_LAMP_DATA;
-	else if(rnatype == &RNA_SpotLamp)
-		return ICON_LAMP_DATA;
-	else if(rnatype == &RNA_SunLamp)
-		return ICON_LAMP_DATA;
-	else if(rnatype == &RNA_HemiLamp)
-		return ICON_LAMP_DATA;
-	else if(rnatype == &RNA_Lamp)
-		return ICON_LAMP_DATA;
-	else if(rnatype == &RNA_Group)
-		return ICON_GROUP;
-	else if(rnatype == &RNA_ParticleSystem)
-		return ICON_PARTICLE_DATA;
-	else if(rnatype == &RNA_ParticleSettings)
-		return ICON_PARTICLE_DATA;
-	else if(rnatype == &RNA_Material)
-		return ICON_MATERIAL_DATA;
-	else if(rnatype == &RNA_Texture)
-		return ICON_TEXTURE_DATA;
-	else if(rnatype == &RNA_TextureSlot)
-		return ICON_TEXTURE_DATA;
-	else if(rnatype == &RNA_WorldTextureSlot)
-		return ICON_TEXTURE_DATA;
-	else if(rnatype == &RNA_MaterialTextureSlot)
-		return ICON_TEXTURE_DATA;
-	else if(rnatype == &RNA_Image)
-		return ICON_IMAGE_DATA;
-	else if(rnatype == &RNA_Screen)
-		return ICON_SPLITSCREEN;
-	else if(rnatype == &RNA_NodeTree)
-		return ICON_NODE;
-	else if(rnatype == &RNA_Text)
-		return ICON_TEXT;
-	else if(rnatype == &RNA_Sound)
-		return ICON_SOUND;
-	else if(rnatype == &RNA_Brush)
-		return ICON_BRUSH_DATA;
-	else if(rnatype == &RNA_VectorFont)
-		return ICON_FONT_DATA;
-	else if(rnatype == &RNA_Library)
-		return ICON_LIBRARY_DATA_DIRECT;
-	else if(rnatype == &RNA_Action)
-		return ICON_ACTION;
-	else if(rnatype == &RNA_FCurve)
-		return ICON_ANIM_DATA;
-	//else if(rnatype == &RNA_Ipo)
-	//	return ICON_ANIM_DATA;
-	else if(rnatype == &RNA_Key)
-		return ICON_SHAPEKEY_DATA;
-	else if(rnatype == &RNA_Main)
-		return ICON_BLENDER;
-	else if(rnatype == &RNA_Struct)
-		return ICON_RNA;
-	else if(rnatype == &RNA_Property)
-		return ICON_RNA;
-	else if(rnatype == &RNA_BooleanProperty)
-		return ICON_RNA;
-	else if(rnatype == &RNA_IntProperty)
-		return ICON_RNA;
-	else if(rnatype == &RNA_FloatProperty)
-		return ICON_RNA;
-	else if(rnatype == &RNA_StringProperty)
-		return ICON_RNA;
-	else if(rnatype == &RNA_EnumProperty)
-		return ICON_RNA;
-	else if(rnatype == &RNA_EnumPropertyItem)
-		return ICON_RNA;
-	else if(rnatype == &RNA_PointerProperty)
-		return ICON_RNA;
-	else if(rnatype == &RNA_CollectionProperty)
-		return ICON_RNA;
-	else if(rnatype == &RNA_GameObjectSettings)
-		return ICON_GAME;
-	else if(rnatype == &RNA_ScriptLink)
-		return ICON_PYTHON;
-	
-	/* modifiers */
-	else if(rnatype == &RNA_SubsurfModifier)
-		return ICON_MOD_SUBSURF;
-	else if(rnatype == &RNA_ArmatureModifier)
-		return ICON_MOD_ARMATURE;
-	else if(rnatype == &RNA_LatticeModifier)
-		return ICON_MOD_LATTICE;
-	else if(rnatype == &RNA_CurveModifier)
-		return ICON_MOD_CURVE;
-	else if(rnatype == &RNA_BuildModifier)
-		return ICON_MOD_BUILD;
-	else if(rnatype == &RNA_MirrorModifier)
-		return ICON_MOD_MIRROR;
-	else if(rnatype == &RNA_DecimateModifier)
-		return ICON_MOD_DECIM;
-	else if(rnatype == &RNA_WaveModifier)
-		return ICON_MOD_WAVE;
-	else if(rnatype == &RNA_HookModifier)
-		return ICON_HOOK;
-	else if(rnatype == &RNA_SoftbodyModifier)
-		return ICON_MOD_SOFT;
-	else if(rnatype == &RNA_BooleanModifier)
-		return ICON_MOD_BOOLEAN;
-	else if(rnatype == &RNA_ParticleInstanceModifier)
-		return ICON_MOD_PARTICLES;
-	else if(rnatype == &RNA_ParticleSystemModifier)
-		return ICON_MOD_PARTICLES;
-	else if(rnatype == &RNA_EdgeSplitModifier)
-		return ICON_MOD_EDGESPLIT;
-	else if(rnatype == &RNA_ArrayModifier)
-		return ICON_MOD_ARRAY;
-	else if(rnatype == &RNA_UVProjectModifier)
-		return ICON_MOD_UVPROJECT;
-	else if(rnatype == &RNA_DisplaceModifier)
-		return ICON_MOD_DISPLACE;
-	else if(rnatype == &RNA_ShrinkwrapModifier)
-		return ICON_MOD_SHRINKWRAP;
-	else if(rnatype == &RNA_CastModifier)
-		return ICON_MOD_CAST;
-	else if(rnatype == &RNA_MeshDeformModifier)
-		return ICON_MOD_MESHDEFORM;
-	else if(rnatype == &RNA_BevelModifier)
-		return ICON_MOD_BEVEL;
-	else if(rnatype == &RNA_SmoothModifier)
-		return ICON_MOD_SMOOTH;
-	else if(rnatype == &RNA_SimpleDeformModifier)
-		return ICON_MOD_SIMPLEDEFORM;
-	else if(rnatype == &RNA_MaskModifier)
-		return ICON_MOD_MASK;
-	else if(rnatype == &RNA_ClothModifier)
-		return ICON_MOD_CLOTH;
-	else if(rnatype == &RNA_ExplodeModifier)
-		return ICON_MOD_EXPLODE;
-	else if(rnatype == &RNA_CollisionModifier)
-		return ICON_MOD_PHYSICS;
-	else if(rnatype == &RNA_FluidSimulationModifier)
-		return ICON_MOD_FLUIDSIM;
-	else if(rnatype == &RNA_MultiresModifier)
-		return ICON_MOD_MULTIRES;
-	else
-		return ICON_DOT;
-}
-
 uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int index, char *name, int icon, int x1, int y1, int x2, int y2)
 {
 	uiBut *but=NULL;
@@ -297,7 +117,7 @@ uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int ind
 			pptr= RNA_property_pointer_get(ptr, prop);
 			if(!pptr.type)
 				pptr.type= RNA_property_pointer_type(prop);
-			icon= UI_GetIconRNA(&pptr);
+			icon= RNA_struct_ui_icon(pptr.type);
 
 			but= uiDefIconTextButR(block, IDPOIN, 0, icon, name, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
 			break;