kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Custom icon for triangulate modifier.

Browse Source
This commit is contained in:
Antony Riakiotakis 2012-11-19 23:35:38 +00:00
parent b85283b63d
commit 347b257131
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
release/datafiles/blender_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 223 KiB

After

Width:  |  Height:  |  Size: 224 KiB

2
source/blender/editors/include/UI_icons.h
View File

@ -593,6 +593,7 @@ DEF_ICON(MOD_REMESH)
DEF_ICON(MOD_OCEAN) DEF_ICON(MOD_OCEAN)
DEF_ICON(MOD_WARP) DEF_ICON(MOD_WARP)
DEF_ICON(MOD_SKIN) DEF_ICON(MOD_SKIN)
DEF_ICON(MOD_TRIANGULATE)
#ifndef DEF_ICON_BLANK_SKIP #ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK166) DEF_ICON(BLANK166)
DEF_ICON(BLANK167) DEF_ICON(BLANK167)
@ -606,7 +607,6 @@ DEF_ICON(MOD_SKIN)
DEF_ICON(BLANK175) DEF_ICON(BLANK175)
DEF_ICON(BLANK176) DEF_ICON(BLANK176)
DEF_ICON(BLANK177) DEF_ICON(BLANK177)
DEF_ICON(BLANK177b)
#endif #endif
/* ANIMATION */ /* ANIMATION */

2
source/blender/editors/space_outliner/outliner_draw.c
View File

@ -1039,7 +1039,7 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
case eModifierType_Skin: case eModifierType_Skin:
UI_icon_draw(x, y, ICON_MOD_SKIN); break; UI_icon_draw(x, y, ICON_MOD_SKIN); break;
case eModifierType_Triangulate: case eModifierType_Triangulate:
UI_icon_draw(x, y, ICON_MOD_SKIN); break; UI_icon_draw(x, y, ICON_MOD_TRIANGULATE); break;
/* Default */ /* Default */
case eModifierType_None: case eModifierType_None:

4
source/blender/makesrna/intern/rna_modifier.c
View File

@ -78,7 +78,7 @@ EnumPropertyItem modifier_type_items[] = {
{eModifierType_Skin, "SKIN", ICON_MOD_SKIN, "Skin", ""}, {eModifierType_Skin, "SKIN", ICON_MOD_SKIN, "Skin", ""},
{eModifierType_Solidify, "SOLIDIFY", ICON_MOD_SOLIDIFY, "Solidify", ""}, {eModifierType_Solidify, "SOLIDIFY", ICON_MOD_SOLIDIFY, "Solidify", ""},
{eModifierType_Subsurf, "SUBSURF", ICON_MOD_SUBSURF, "Subdivision Surface", ""}, {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"), ""}, {0, "", 0, N_("Deform"), ""},
{eModifierType_Armature, "ARMATURE", ICON_MOD_ARMATURE, "Armature", ""}, {eModifierType_Armature, "ARMATURE", ICON_MOD_ARMATURE, "Armature", ""},
{eModifierType_Cast, "CAST", ICON_MOD_CAST, "Cast", ""}, {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"); srna = RNA_def_struct(brna, "TriangulateModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Triangulate Modifier", "Triangulate Mesh"); RNA_def_struct_ui_text(srna, "Triangulate Modifier", "Triangulate Mesh");
RNA_def_struct_sdna(srna, "TriangulateModifierData"); 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); prop = RNA_def_property(srna, "use_beauty", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "beauty", 1); RNA_def_property_boolean_sdna(prop, NULL, "beauty", 1);