Ocean Modifier UI fixes:
authorThomas Dinges <blender@dingto.org>
Sun, 22 Jan 2012 22:30:45 +0000 (22:30 +0000)
committerThomas Dinges <blender@dingto.org>
Sun, 22 Jan 2012 22:30:45 +0000 (22:30 +0000)
* 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.

source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesrna/intern/rna_modifier.c

index 0264cf5ad05ba5ae08fc256f800c9443f8fe5898..eaa04a1e09ec79c1270e4b7e483522a79cc3c874 100644 (file)
@@ -1022,6 +1022,8 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
                                                UI_icon_draw(x, y, ICON_MOD_VERTEX_WEIGHT); break;
                                        case eModifierType_DynamicPaint:
                                                UI_icon_draw(x, y, ICON_MOD_DYNAMICPAINT); break;
                                                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;
                                }
                                        default:
                                                UI_icon_draw(x, y, ICON_DOT); break;
                                }
index 3f3ac6ce9060db792bc2522daab1209bfd24020e..50eb3d394df0526bbf78067a4e7dfb81d885fefd 100644 (file)
@@ -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");
        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);
        
        /* General check if blender was built with OceanSim modifier support */
        prop= RNA_def_property(srna, "is_build_enabled", PROP_BOOLEAN, PROP_NONE);