Revision: 41795
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41795
Author: blendix
Date: 2011-11-13 14:54:11 +0000 (Sun, 13 Nov 2011)
Log Message:
-----------
Ocean Sim: sort alphabetically in modifier list, fix python error trying to
show "Built without OceanSim modifier" message.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
Modified:
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
2011-11-13 14:50:19 UTC (rev 41794)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
2011-11-13 14:54:11 UTC (rev 41795)
@@ -416,7 +416,7 @@
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")
Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2011-11-13
14:50:19 UTC (rev 41794)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2011-11-13
14:54:11 UTC (rev 41795)
@@ -88,15 +88,15 @@
{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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
