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

2.6 UI Modifier Icons:

Browse Source 
* New Ocean Icon, created by Leon Cheung. Thanks! Approved by Lukas and myself.
* New Warp Icon, created by "Zafio"

Blender artists Thread where the Icons come from: http://blenderartists.org/forum/showthread.php?243354-Call-for-Modifier-Icons!
This commit is contained in:
Thomas Dinges 2012-02-12 19:57:47 +00:00
parent f7c032b765
commit 9c2d3a8ed1
5 changed files with 6869 additions and 6828 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: 213 KiB

After

Width:  |  Height:  |  Size: 214 KiB

13681
source/blender/editors/datafiles/blender_icons.png.c
View File

File diff suppressed because it is too large Load Diff

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

@ -590,9 +590,9 @@ DEF_ICON(MOD_SCREW)
DEF_ICON(MOD_VERTEX_WEIGHT)
DEF_ICON(MOD_DYNAMICPAINT)
DEF_ICON(MOD_REMESH)
DEF_ICON(MOD_OCEAN)
DEF_ICON(MOD_WARP)
#ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK163)
DEF_ICON(BLANK164)
DEF_ICON(BLANK165)
DEF_ICON(BLANK166)
DEF_ICON(BLANK167)

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

@ -1023,7 +1023,9 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
case eModifierType_DynamicPaint:
UI_icon_draw(x, y, ICON_MOD_DYNAMICPAINT); break;
case eModifierType_Ocean:
UI_icon_draw(x, y, ICON_MOD_WAVE); break;
UI_icon_draw(x, y, ICON_MOD_OCEAN); break;
case eModifierType_Warp:
UI_icon_draw(x, y, ICON_MOD_WARP); break;
default:
UI_icon_draw(x, y, ICON_DOT); break;
}

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

@ -84,7 +84,7 @@ EnumPropertyItem modifier_type_items[] ={
{eModifierType_Shrinkwrap, "SHRINKWRAP", ICON_MOD_SHRINKWRAP, "Shrinkwrap", ""},
{eModifierType_SimpleDeform, "SIMPLE_DEFORM", ICON_MOD_SIMPLEDEFORM, "Simple Deform", ""},
{eModifierType_Smooth, "SMOOTH", ICON_MOD_SMOOTH, "Smooth", ""},
{eModifierType_Warp, "WARP", ICON_MOD_SUBSURF, "Warp", ""},
{eModifierType_Warp, "WARP", ICON_MOD_WARP, "Warp", ""},
{eModifierType_Wave, "WAVE", ICON_MOD_WAVE, "Wave", ""},
{0, "", 0, "Simulate", ""},
{eModifierType_Cloth, "CLOTH", ICON_MOD_CLOTH, "Cloth", ""},
@ -92,7 +92,7 @@ EnumPropertyItem modifier_type_items[] ={
{eModifierType_DynamicPaint, "DYNAMIC_PAINT", ICON_MOD_DYNAMICPAINT, "Dynamic Paint", ""},
{eModifierType_Explode, "EXPLODE", ICON_MOD_EXPLODE, "Explode", ""},
{eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MOD_FLUIDSIM, "Fluid Simulation", ""},
{eModifierType_Ocean, "OCEAN", ICON_MOD_WAVE, "Ocean", ""},
{eModifierType_Ocean, "OCEAN", ICON_MOD_OCEAN, "Ocean", ""},
{eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES, "Particle Instance", ""},
{eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "Particle System", ""},
{eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""},
@ -832,7 +832,7 @@ static void rna_def_modifier_warp(BlenderRNA *brna)
srna= RNA_def_struct(brna, "WarpModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Warp Modifier", "Warp modifier");
RNA_def_struct_sdna(srna, "WarpModifierData");
//RNA_def_struct_ui_icon(srna, ICON_MOD_SUBSURF);
RNA_def_struct_ui_icon(srna, ICON_MOD_WARP);
prop= RNA_def_property(srna, "object_from", PROP_POINTER, PROP_NONE);
RNA_def_property_ui_text(prop, "From", "Object to transform from");
@ -2901,7 +2901,7 @@ static void rna_def_modifier_ocean(BlenderRNA *brna)
srna= RNA_def_struct(brna, "OceanModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Ocean Modifier", "Simulate an ocean surface");
RNA_def_struct_sdna(srna, "OceanModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_WAVE);
RNA_def_struct_ui_icon(srna, ICON_MOD_OCEAN);
/* General check if blender was built with OceanSim modifier support */
prop= RNA_def_property(srna, "is_build_enabled", PROP_BOOLEAN, PROP_NONE);