[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43622] trunk/blender/source/blender: Ocean Modifier UI fixes:
Thomas Dinges
blender at dingto.org
Sun Jan 22 23:30:55 CET 2012
Revision: 43622
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43622
Author: dingto
Date: 2012-01-22 22:30:45 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
Ocean Modifier UI fixes:
* Modifier Icon was missing in the outliner
* Fluid icon was used in the rna struct, fixed
Note: Ocean uses the Wave modifier icon atm, if we find a better one, this can be changed.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_draw.c 2012-01-22 22:20:20 UTC (rev 43621)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_draw.c 2012-01-22 22:30:45 UTC (rev 43622)
@@ -1022,6 +1022,8 @@
UI_icon_draw(x, y, ICON_MOD_VERTEX_WEIGHT); break;
case eModifierType_DynamicPaint:
UI_icon_draw(x, y, ICON_MOD_DYNAMICPAINT); break;
+ case eModifierType_Ocean:
+ UI_icon_draw(x, y, ICON_MOD_WAVE); break;
default:
UI_icon_draw(x, y, ICON_DOT); break;
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2012-01-22 22:20:20 UTC (rev 43621)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2012-01-22 22:30:45 UTC (rev 43622)
@@ -2901,7 +2901,7 @@
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_FLUIDSIM);
+ RNA_def_struct_ui_icon(srna, ICON_MOD_WAVE);
/* General check if blender was built with OceanSim modifier support */
prop= RNA_def_property(srna, "is_build_enabled", PROP_BOOLEAN, PROP_NONE);
More information about the Bf-blender-cvs
mailing list