diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-05-13 14:38:39 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-05-13 14:38:39 +0400 |
| commit | 8899af40fd556f7c356dc781d705aa38a53dec4a (patch) | |
| tree | 48ab6894131f01053abeff24d23084aa88bf8033 /source/blender/src/drawnla.c | |
| parent | 4600b3e475189f4d7fcd3e151360e222d1229790 (diff) | |
Bugfix #4191
NLA window: the "blend in/out" values were limited to action lenght, which
should the strip length instead.
Diffstat (limited to 'source/blender/src/drawnla.c')
| -rw-r--r-- | source/blender/src/drawnla.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/drawnla.c b/source/blender/src/drawnla.c index e3436645adc..9232feb3d41 100644 --- a/source/blender/src/drawnla.c +++ b/source/blender/src/drawnla.c @@ -483,8 +483,8 @@ static void nla_panel_properties(short cntrl) // NLA_HANDLER_PROPERTIES } uiBlockBeginAlign(block); - uiDefButF(block, NUM, B_NLA_PANEL, "Blendin:", 10,100,145,19, &strip->blendin, 0.0, strip->actend-strip->actstart, 100, 0, "Number of frames of ease-in"); - uiDefButF(block, NUM, B_NLA_PANEL, "Blendout:", 10,80,145,19, &strip->blendout, 0.0, strip->actend-strip->actstart, 100, 0, "Number of frames of ease-out"); + uiDefButF(block, NUM, B_NLA_PANEL, "Blendin:", 10,100,145,19, &strip->blendin, 0.0, strip->end-strip->start, 100, 0, "Number of frames of ease-in"); + uiDefButF(block, NUM, B_NLA_PANEL, "Blendout:", 10,80,145,19, &strip->blendout, 0.0, strip->end-strip->start, 100, 0, "Number of frames of ease-out"); uiBlockBeginAlign(block); uiDefButF(block, NUM, B_NLA_PANEL, "Repeat:", 160,100,150,19, &strip->repeat, 0.001, 1000.0f, 100, 0, "Number of times the action should repeat"); |