diff options
Diffstat (limited to 'source/blender/editors/animation/fmodifier_ui.c')
| -rw-r--r-- | source/blender/editors/animation/fmodifier_ui.c | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c index 2b8d0f35b9a..7642f63b531 100644 --- a/source/blender/editors/animation/fmodifier_ui.c +++ b/source/blender/editors/animation/fmodifier_ui.c @@ -225,14 +225,14 @@ static void draw_modifier__fn_generator(uiLayout *layout, ID *id, FModifier *fcm /* add the settings */ col= uiLayoutColumn(layout, 1); - uiItemR(col, &ptr, "function_type", 0, "", 0); - uiItemR(col, &ptr, "use_additive", UI_ITEM_R_TOGGLE, NULL, 0); + uiItemR(col, &ptr, "function_type", 0, "", ICON_NULL); + uiItemR(col, &ptr, "use_additive", UI_ITEM_R_TOGGLE, NULL, ICON_NULL); col= uiLayoutColumn(layout, 0); // no grouping for now - uiItemR(col, &ptr, "amplitude", 0, NULL, 0); - uiItemR(col, &ptr, "phase_multiplier", 0, NULL, 0); - uiItemR(col, &ptr, "phase_offset", 0, NULL, 0); - uiItemR(col, &ptr, "value_offset", 0, NULL, 0); + uiItemR(col, &ptr, "amplitude", 0, NULL, ICON_NULL); + uiItemR(col, &ptr, "phase_multiplier", 0, NULL, ICON_NULL); + uiItemR(col, &ptr, "phase_offset", 0, NULL, ICON_NULL); + uiItemR(col, &ptr, "value_offset", 0, NULL, ICON_NULL); } /* --------------- */ @@ -253,15 +253,15 @@ static void draw_modifier__cycles(uiLayout *layout, ID *id, FModifier *fcm, shor /* before range */ col= uiLayoutColumn(split, 1); - uiItemL(col, "Before:", 0); - uiItemR(col, &ptr, "mode_before", 0, "", 0); - uiItemR(col, &ptr, "cycles_before", 0, NULL, 0); + uiItemL(col, "Before:", ICON_NULL); + uiItemR(col, &ptr, "mode_before", 0, "", ICON_NULL); + uiItemR(col, &ptr, "cycles_before", 0, NULL, ICON_NULL); /* after range */ col= uiLayoutColumn(split, 1); - uiItemL(col, "After:", 0); - uiItemR(col, &ptr, "mode_after", 0, "", 0); - uiItemR(col, &ptr, "cycles_after", 0, NULL, 0); + uiItemL(col, "After:", ICON_NULL); + uiItemR(col, &ptr, "mode_after", 0, "", ICON_NULL); + uiItemR(col, &ptr, "cycles_after", 0, NULL, ICON_NULL); } /* --------------- */ @@ -276,20 +276,20 @@ static void draw_modifier__noise(uiLayout *layout, ID *id, FModifier *fcm, short RNA_pointer_create(id, &RNA_FModifierNoise, fcm, &ptr); /* blending mode */ - uiItemR(layout, &ptr, "blend_type", 0, NULL, 0); + uiItemR(layout, &ptr, "blend_type", 0, NULL, ICON_NULL); /* split into 2 columns */ split= uiLayoutSplit(layout, 0.5f, 0); /* col 1 */ col= uiLayoutColumn(split, 0); - uiItemR(col, &ptr, "scale", 0, NULL, 0); - uiItemR(col, &ptr, "strength", 0, NULL, 0); + uiItemR(col, &ptr, "scale", 0, NULL, ICON_NULL); + uiItemR(col, &ptr, "strength", 0, NULL, ICON_NULL); /* col 2 */ col= uiLayoutColumn(split, 0); - uiItemR(col, &ptr, "phase", 0, NULL, 0); - uiItemR(col, &ptr, "depth", 0, NULL, 0); + uiItemR(col, &ptr, "phase", 0, NULL, ICON_NULL); + uiItemR(col, &ptr, "depth", 0, NULL, ICON_NULL); } /* --------------- */ @@ -469,12 +469,12 @@ static void draw_modifier__envelope(uiLayout *layout, ID *id, FModifier *fcm, sh /* general settings */ col= uiLayoutColumn(layout, 1); - uiItemL(col, "Envelope:", 0); - uiItemR(col, &ptr, "reference_value", 0, NULL, 0); + uiItemL(col, "Envelope:", ICON_NULL); + uiItemR(col, &ptr, "reference_value", 0, NULL, ICON_NULL); row= uiLayoutRow(col, 1); - uiItemR(row, &ptr, "default_min", 0, "Min", 0); - uiItemR(row, &ptr, "default_max", 0, "Max", 0); + uiItemR(row, &ptr, "default_min", 0, "Min", ICON_NULL); + uiItemR(row, &ptr, "default_max", 0, "Max", ICON_NULL); /* control points header */ // TODO: move this control-point control stuff to using the new special widgets for lists @@ -526,13 +526,13 @@ static void draw_modifier__limits(uiLayout *layout, ID *id, FModifier *fcm, shor /* x-minimum */ col= uiLayoutColumn(split, 1); - uiItemR(col, &ptr, "use_min_x", 0, NULL, 0); - uiItemR(col, &ptr, "min_x", 0, NULL, 0); + uiItemR(col, &ptr, "use_min_x", 0, NULL, ICON_NULL); + uiItemR(col, &ptr, "min_x", 0, NULL, ICON_NULL); /* y-minimum*/ col= uiLayoutColumn(split, 1); - uiItemR(col, &ptr, "use_min_y", 0, NULL, 0); - uiItemR(col, &ptr, "min_y", 0, NULL, 0); + uiItemR(col, &ptr, "use_min_y", 0, NULL, ICON_NULL); + uiItemR(col, &ptr, "min_y", 0, NULL, ICON_NULL); } /* row 2: maximum */ @@ -544,13 +544,13 @@ static void draw_modifier__limits(uiLayout *layout, ID *id, FModifier *fcm, shor /* x-minimum */ col= uiLayoutColumn(split, 1); - uiItemR(col, &ptr, "use_max_x", 0, NULL, 0); - uiItemR(col, &ptr, "max_x", 0, NULL, 0); + uiItemR(col, &ptr, "use_max_x", 0, NULL, ICON_NULL); + uiItemR(col, &ptr, "max_x", 0, NULL, ICON_NULL); /* y-minimum*/ col= uiLayoutColumn(split, 1); - uiItemR(col, &ptr, "use_max_y", 0, NULL, 0); - uiItemR(col, &ptr, "max_y", 0, NULL, 0); + uiItemR(col, &ptr, "use_max_y", 0, NULL, ICON_NULL); + uiItemR(col, &ptr, "max_y", 0, NULL, ICON_NULL); } } @@ -567,24 +567,24 @@ static void draw_modifier__stepped(uiLayout *layout, ID *id, FModifier *fcm, sho /* block 1: "stepping" settings */ col= uiLayoutColumn(layout, 0); - uiItemR(col, &ptr, "frame_step", 0, NULL, 0); - uiItemR(col, &ptr, "frame_offset", 0, NULL, 0); + uiItemR(col, &ptr, "frame_step", 0, NULL, ICON_NULL); + uiItemR(col, &ptr, "frame_offset", 0, NULL, ICON_NULL); /* block 2: start range settings */ col= uiLayoutColumn(layout, 1); - uiItemR(col, &ptr, "use_frame_start", 0, NULL, 0); + uiItemR(col, &ptr, "use_frame_start", 0, NULL, ICON_NULL); subcol = uiLayoutColumn(col, 1); uiLayoutSetActive(subcol, RNA_boolean_get(&ptr, "use_frame_start")); - uiItemR(subcol, &ptr, "frame_start", 0, NULL, 0); + uiItemR(subcol, &ptr, "frame_start", 0, NULL, ICON_NULL); /* block 3: end range settings */ col= uiLayoutColumn(layout, 1); - uiItemR(col, &ptr, "use_frame_end", 0, NULL, 0); + uiItemR(col, &ptr, "use_frame_end", 0, NULL, ICON_NULL); subcol = uiLayoutColumn(col, 1); uiLayoutSetActive(subcol, RNA_boolean_get(&ptr, "use_frame_end")); - uiItemR(subcol, &ptr, "frame_end", 0, NULL, 0); + uiItemR(subcol, &ptr, "frame_end", 0, NULL, ICON_NULL); } /* --------------- */ @@ -616,16 +616,16 @@ void ANIM_uiTemplate_fmodifier_draw (uiLayout *layout, ID *id, ListBase *modifie uiBlockSetEmboss(block, UI_EMBOSSN); /* expand */ - uiItemR(subrow, &ptr, "show_expanded", UI_ITEM_R_ICON_ONLY, "", 0); + uiItemR(subrow, &ptr, "show_expanded", UI_ITEM_R_ICON_ONLY, "", ICON_NULL); /* checkbox for 'active' status (for now) */ - uiItemR(subrow, &ptr, "active", UI_ITEM_R_ICON_ONLY, "", 0); + uiItemR(subrow, &ptr, "active", UI_ITEM_R_ICON_ONLY, "", ICON_NULL); /* name */ if (fmi) - uiItemL(subrow, fmi->name, 0); + uiItemL(subrow, fmi->name, ICON_NULL); else - uiItemL(subrow, "<Unknown Modifier>", 0); + uiItemL(subrow, "<Unknown Modifier>", ICON_NULL); /* right-align ------------------------------------------- */ subrow= uiLayoutRow(row, 0); @@ -633,7 +633,7 @@ void ANIM_uiTemplate_fmodifier_draw (uiLayout *layout, ID *id, ListBase *modifie /* 'mute' button */ - uiItemR(subrow, &ptr, "mute", UI_ITEM_R_ICON_ONLY, "", 0); + uiItemR(subrow, &ptr, "mute", UI_ITEM_R_ICON_ONLY, "", ICON_NULL); uiBlockSetEmboss(block, UI_EMBOSSN); |