From 048c7879fa3879068a85aacc5c0304715b86353c Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Fri, 19 Jan 2007 10:05:17 +0000 Subject: =Forward cycling fix= Commit of patch #5385, to make forward cycling more user-controllable. Previously it only worked on one axis, which was auto-detected from movement. This allows forward cycling to work in more situations, such as stair stepping. --- source/blender/src/drawnla.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'source/blender/src/drawnla.c') diff --git a/source/blender/src/drawnla.c b/source/blender/src/drawnla.c index e9710ff52ba..277e41b5f0e 100644 --- a/source/blender/src/drawnla.c +++ b/source/blender/src/drawnla.c @@ -589,10 +589,19 @@ static void nla_panel_properties(short cntrl) // NLA_HANDLER_PROPERTIES uiButSetCompleteFunc(but, autocomplete_bone, (void *)ob); uiDefButBitS(block, TOG, ACTSTRIP_HOLDLASTFRAME, B_NLA_PANEL, "Hold", 160,60,75,19, &strip->flag, 0, 0, 0, 0, "Toggles whether to continue displaying the last frame past the end of the strip"); uiDefButS(block, TOG, B_NLA_PANEL, "Add", 235,60,75,19, &strip->mode, 0, 0, 0, 0, "Toggles additive blending mode"); + uiBlockEndAlign(block); - + uiDefButBitS(block, TOG, ACTSTRIP_USESTRIDE, B_NLA_PANEL, "Stride Path", 10, 30,140,19, &strip->flag, 0, 0, 0, 0, "Plays action based on path position & stride"); + if (strip->offs_bone[0]) { + uiBlockBeginAlign(block); + uiDefButBitS(block, TOG, ACTSTRIP_CYCLIC_USEX, B_NLA_PANEL, "Use X", 160,30,50,19, &strip->flag, 0, 0, 0, 0, "Turn off automatic single-axis cycling and use X as an offset axis. Note that you can use multiple axes at once."); + uiDefButBitS(block, TOG, ACTSTRIP_CYCLIC_USEY, B_NLA_PANEL, "Use Y", 210,30,50,19, &strip->flag, 0, 0, 0, 0, "Turn off automatic single-axis cycling and use Y as an offset axis. Note that you can use multiple axes at once."); + uiDefButBitS(block, TOG, ACTSTRIP_CYCLIC_USEZ, B_NLA_PANEL, "Use Z", 260,30,50,19, &strip->flag, 0, 0, 0, 0, "Turn off automatic single-axis cycling and use Z as an offset axis. Note that you can use multiple axes at once."); + uiBlockEndAlign(block); + } + if(ob->dup_group) uiDefIDPoinBut(block, test_obpoin_but, ID_OB, B_NLA_PANEL, "Target:", 160,30, 150, 19, &strip->object, "Target Object in this group"); -- cgit v1.2.3