diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2012-11-20 03:35:38 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2012-11-20 03:35:38 +0400 |
| commit | 347b2571314bc1a8319cfa3daa5637aebae0fd7d (patch) | |
| tree | 6b7e8593a02f214a96be18604a36e1022e09ec4b | |
| parent | b85283b63dd1ad7f360b96b64ee888ed03b6e96d (diff) | |
Custom icon for triangulate modifier.
| -rw-r--r-- | release/datafiles/blender_icons.png | bin | 228237 -> 229017 bytes | |||
| -rw-r--r-- | source/blender/editors/include/UI_icons.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/release/datafiles/blender_icons.png b/release/datafiles/blender_icons.png Binary files differindex 257de8ae3c8..e09d7062780 100644 --- a/release/datafiles/blender_icons.png +++ b/release/datafiles/blender_icons.png diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index e400e44e944..10c585aa802 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -593,6 +593,7 @@ DEF_ICON(MOD_REMESH) DEF_ICON(MOD_OCEAN) DEF_ICON(MOD_WARP) DEF_ICON(MOD_SKIN) +DEF_ICON(MOD_TRIANGULATE) #ifndef DEF_ICON_BLANK_SKIP DEF_ICON(BLANK166) DEF_ICON(BLANK167) @@ -606,7 +607,6 @@ DEF_ICON(MOD_SKIN) DEF_ICON(BLANK175) DEF_ICON(BLANK176) DEF_ICON(BLANK177) - DEF_ICON(BLANK177b) #endif /* ANIMATION */ diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 4f640c579a5..61d513929ad 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1039,7 +1039,7 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto case eModifierType_Skin: UI_icon_draw(x, y, ICON_MOD_SKIN); break; case eModifierType_Triangulate: - UI_icon_draw(x, y, ICON_MOD_SKIN); break; + UI_icon_draw(x, y, ICON_MOD_TRIANGULATE); break; /* Default */ case eModifierType_None: diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 1f6eb4af577..53d145072d3 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -78,7 +78,7 @@ EnumPropertyItem modifier_type_items[] = { {eModifierType_Skin, "SKIN", ICON_MOD_SKIN, "Skin", ""}, {eModifierType_Solidify, "SOLIDIFY", ICON_MOD_SOLIDIFY, "Solidify", ""}, {eModifierType_Subsurf, "SUBSURF", ICON_MOD_SUBSURF, "Subdivision Surface", ""}, - {eModifierType_Triangulate, "TRIANGULATE", ICON_MOD_SKIN, "Triangulate", ""}, + {eModifierType_Triangulate, "TRIANGULATE", ICON_MOD_TRIANGULATE, "Triangulate", ""}, {0, "", 0, N_("Deform"), ""}, {eModifierType_Armature, "ARMATURE", ICON_MOD_ARMATURE, "Armature", ""}, {eModifierType_Cast, "CAST", ICON_MOD_CAST, "Cast", ""}, @@ -3372,7 +3372,7 @@ static void rna_def_modifier_triangulate(BlenderRNA *brna) srna = RNA_def_struct(brna, "TriangulateModifier", "Modifier"); RNA_def_struct_ui_text(srna, "Triangulate Modifier", "Triangulate Mesh"); RNA_def_struct_sdna(srna, "TriangulateModifierData"); - RNA_def_struct_ui_icon(srna, ICON_MOD_SKIN); + RNA_def_struct_ui_icon(srna, ICON_MOD_TRIANGULATE); prop = RNA_def_property(srna, "use_beauty", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "beauty", 1); |
