[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52381] trunk/blender: Custom icon for triangulate modifier.
Antony Riakiotakis
kalast at gmail.com
Tue Nov 20 00:35:42 CET 2012
Revision: 52381
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52381
Author: psy-fi
Date: 2012-11-19 23:35:38 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
Custom icon for triangulate modifier.
Modified Paths:
--------------
trunk/blender/release/datafiles/blender_icons.png
trunk/blender/source/blender/editors/include/UI_icons.h
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
Modified: trunk/blender/release/datafiles/blender_icons.png
===================================================================
(Binary files differ)
Modified: trunk/blender/source/blender/editors/include/UI_icons.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_icons.h 2012-11-19 23:33:02 UTC (rev 52380)
+++ trunk/blender/source/blender/editors/include/UI_icons.h 2012-11-19 23:35:38 UTC (rev 52381)
@@ -593,6 +593,7 @@
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(BLANK175)
DEF_ICON(BLANK176)
DEF_ICON(BLANK177)
- DEF_ICON(BLANK177b)
#endif
/* ANIMATION */
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_draw.c 2012-11-19 23:33:02 UTC (rev 52380)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_draw.c 2012-11-19 23:35:38 UTC (rev 52381)
@@ -1039,7 +1039,7 @@
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:
Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2012-11-19 23:33:02 UTC (rev 52380)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2012-11-19 23:35:38 UTC (rev 52381)
@@ -78,7 +78,7 @@
{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 @@
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);
More information about the Bf-blender-cvs
mailing list