From eda757d4c8df59ae75de54506e810a3abb783107 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Fri, 26 Apr 2013 13:42:55 +0000 Subject: Bugfix [#34645] NlaStrip Tweak Mode - No automatic action length sync on exit Originally I was thinking of not restoring this functionality (see report for further details). However, upon rechecking the code, it seems that there was actually a define set up for this already, but which wasn't actually hooked up yet. So, this commit basically exposes this option ("Sync Length") which ensures that when exiting tweak mode on a NLA Strip, that strip instance (and not other users of the same action) will be updated to include the newly added keyframes. This option is not enabled by default, and shouldn't really be needed in most ("intended") workflows. --- source/blender/editors/space_nla/nla_buttons.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/space_nla') diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 3a9336e7acc..4678c46b45f 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -410,7 +410,11 @@ static void nla_panel_actclip(const bContext *C, Panel *pa) uiItemL(column, IFACE_("Action Extents:"), ICON_NONE); uiItemR(column, &strip_ptr, "action_frame_start", 0, IFACE_("Start Frame"), ICON_NONE); uiItemR(column, &strip_ptr, "action_frame_end", 0, IFACE_("End Frame"), ICON_NONE); - uiItemO(column, NULL, ICON_NONE, "NLA_OT_action_sync_length"); + + // XXX: this layout may actually be too abstract and confusing, and may be better using standard column layout + row = uiLayoutRow(layout, FALSE); + uiItemR(row, &strip_ptr, "use_sync_length", 0, IFACE_("Sync Length"), ICON_NONE); + uiItemO(row, IFACE_("Now"), ICON_FILE_REFRESH, "NLA_OT_action_sync_length"); /* action usage */ column = uiLayoutColumn(layout, TRUE); -- cgit v1.2.3