1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ocean Sim: sort alphabetically in modifier list, fix python error trying to

Browse Source 
show "Built without OceanSim modifier" message.
This commit is contained in:
Brecht Van Lommel 2011-11-13 14:54:11 +00:00
parent 2e32ce0ed2
commit 00b695a6f3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/properties_data_modifier.py
View File

@ -416,7 +416,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
def OCEAN(self, layout, ob, md):
if not md.build_enabled:
col.label("Built without OceanSim modifier")
layout.label("Built without OceanSim modifier")
return
layout.prop(md, "geometry_mode")

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

@ -88,15 +88,15 @@ EnumPropertyItem modifier_type_items[] ={
{0, "", 0, "Simulate", ""},
{eModifierType_Cloth, "CLOTH", ICON_MOD_CLOTH, "Cloth", ""},
{eModifierType_Collision, "COLLISION", ICON_MOD_PHYSICS, "Collision", ""},
{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_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES, "Particle Instance", ""},
{eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "Particle System", ""},
{eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""},
{eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""},
{eModifierType_Surface, "SURFACE", ICON_MOD_PHYSICS, "Surface", ""},
{eModifierType_DynamicPaint, "DYNAMIC_PAINT", ICON_MOD_DYNAMICPAINT, "Dynamic Paint", ""},
{eModifierType_Ocean, "OCEAN", ICON_MOD_WAVE, "Ocean", ""},
{0, NULL, 0, NULL, NULL}};
#ifdef RNA_RUNTIME