diff options
Diffstat (limited to 'source/blender/editors/animation/fmodifier_ui.c')
| -rw-r--r-- | source/blender/editors/animation/fmodifier_ui.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c index 3bd8b50c889..191316711f4 100644 --- a/source/blender/editors/animation/fmodifier_ui.c +++ b/source/blender/editors/animation/fmodifier_ui.c @@ -95,7 +95,7 @@ static void delete_fmodifier_cb (bContext *C, void *fmods_v, void *fcm_v) /* send notifiers */ // XXX for now, this is the only way to get updates in all the right places... but would be nice to have a special one in this case - WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME_EDIT, NULL); + WM_event_add_notifier(C, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); } /* --------------- */ @@ -119,7 +119,7 @@ static void draw_modifier__generator(uiLayout *layout, ID *id, FModifier *fcm, s but= uiDefButR(block, MENU, B_FMODIFIER_REDRAW, NULL, 0, 0, width-30, UI_UNIT_Y, &ptr, "mode", -1, 0, 0, -1, -1, NULL); uiButSetFunc(but, validate_fmodifier_cb, fcm, NULL); - uiDefButR(block, TOG, B_FMODIFIER_REDRAW, NULL, 0, 0, width-30, UI_UNIT_Y, &ptr, "additive", -1, 0, 0, -1, -1, NULL); + uiDefButR(block, TOG, B_FMODIFIER_REDRAW, NULL, 0, 0, width-30, UI_UNIT_Y, &ptr, "use_additive", -1, 0, 0, -1, -1, NULL); uiBlockEndAlign(block); /* now add settings for individual modes */ @@ -226,7 +226,7 @@ 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, "additive", UI_ITEM_R_TOGGLE, NULL, 0); + uiItemR(col, &ptr, "use_additive", UI_ITEM_R_TOGGLE, NULL, 0); col= uiLayoutColumn(layout, 0); // no grouping for now uiItemR(col, &ptr, "amplitude", 0, NULL, 0); @@ -254,14 +254,14 @@ 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, "before_mode", 0, "", 0); - uiItemR(col, &ptr, "before_cycles", 0, NULL, 0); + uiItemR(col, &ptr, "mode_before", 0, "", 0); + uiItemR(col, &ptr, "cycles_before", 0, NULL, 0); /* after range */ col= uiLayoutColumn(split, 1); uiItemL(col, "After:", 0); - uiItemR(col, &ptr, "after_mode", 0, "", 0); - uiItemR(col, &ptr, "after_cycles", 0, NULL, 0); + uiItemR(col, &ptr, "mode_after", 0, "", 0); + uiItemR(col, &ptr, "cycles_after", 0, NULL, 0); } /* --------------- */ @@ -276,14 +276,14 @@ 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, "modification", 0, NULL, 0); + uiItemR(layout, &ptr, "blend_type", 0, NULL, 0); /* split into 2 columns */ split= uiLayoutSplit(layout, 0.5f, 0); /* col 1 */ col= uiLayoutColumn(split, 0); - uiItemR(col, &ptr, "size", 0, NULL, 0); + uiItemR(col, &ptr, "scale", 0, NULL, 0); uiItemR(col, &ptr, "strength", 0, NULL, 0); /* col 2 */ @@ -473,8 +473,8 @@ static void draw_modifier__envelope(uiLayout *layout, ID *id, FModifier *fcm, sh uiItemR(col, &ptr, "reference_value", 0, NULL, 0); row= uiLayoutRow(col, 1); - uiItemR(row, &ptr, "default_minimum", 0, "Min", 0); - uiItemR(row, &ptr, "default_maximum", 0, "Max", 0); + uiItemR(row, &ptr, "default_min", 0, "Min", 0); + uiItemR(row, &ptr, "default_max", 0, "Max", 0); /* 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_minimum_x", 0, NULL, 0); - uiItemR(col, &ptr, "minimum_x", 0, NULL, 0); + uiItemR(col, &ptr, "use_min_x", 0, NULL, 0); + uiItemR(col, &ptr, "min_x", 0, NULL, 0); /* y-minimum*/ col= uiLayoutColumn(split, 1); - uiItemR(col, &ptr, "use_minimum_y", 0, NULL, 0); - uiItemR(col, &ptr, "minimum_y", 0, NULL, 0); + uiItemR(col, &ptr, "use_min_y", 0, NULL, 0); + uiItemR(col, &ptr, "min_y", 0, NULL, 0); } /* 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_maximum_x", 0, NULL, 0); - uiItemR(col, &ptr, "maximum_x", 0, NULL, 0); + uiItemR(col, &ptr, "use_max_x", 0, NULL, 0); + uiItemR(col, &ptr, "max_x", 0, NULL, 0); /* y-minimum*/ col= uiLayoutColumn(split, 1); - uiItemR(col, &ptr, "use_maximum_y", 0, NULL, 0); - uiItemR(col, &ptr, "maximum_y", 0, NULL, 0); + uiItemR(col, &ptr, "use_max_y", 0, NULL, 0); + uiItemR(col, &ptr, "max_y", 0, NULL, 0); } } @@ -567,8 +567,8 @@ static void draw_modifier__stepped(uiLayout *layout, ID *id, FModifier *fcm, sho /* block 1: "stepping" settings */ col= uiLayoutColumn(layout, 0); - uiItemR(col, &ptr, "step_size", 0, NULL, 0); - uiItemR(col, &ptr, "offset", 0, NULL, 0); + uiItemR(col, &ptr, "frame_step", 0, NULL, 0); + uiItemR(col, &ptr, "frame_offset", 0, NULL, 0); /* block 2: start range settings */ col= uiLayoutColumn(layout, 1); @@ -616,7 +616,7 @@ void ANIM_uiTemplate_fmodifier_draw (uiLayout *layout, ID *id, ListBase *modifie uiBlockSetEmboss(block, UI_EMBOSSN); /* expand */ - uiItemR(subrow, &ptr, "expanded", UI_ITEM_R_ICON_ONLY, "", 0); + uiItemR(subrow, &ptr, "show_expanded", UI_ITEM_R_ICON_ONLY, "", 0); /* checkbox for 'active' status (for now) */ uiItemR(subrow, &ptr, "active", UI_ITEM_R_ICON_ONLY, "", 0); @@ -633,7 +633,7 @@ void ANIM_uiTemplate_fmodifier_draw (uiLayout *layout, ID *id, ListBase *modifie /* 'mute' button */ - uiItemR(subrow, &ptr, "muted", UI_ITEM_R_ICON_ONLY, "", 0); + uiItemR(subrow, &ptr, "mute", UI_ITEM_R_ICON_ONLY, "", 0); uiBlockSetEmboss(block, UI_EMBOSSN); |