diff options
| author | Ben Batt <benbatt@gmail.com> | 2007-01-30 14:11:20 +0300 |
|---|---|---|
| committer | Ben Batt <benbatt@gmail.com> | 2007-01-30 14:11:20 +0300 |
| commit | a42c8533aa9a87223be11abe3ac2eb4283d7dd64 (patch) | |
| tree | fda1475d001c3f56570bb026c2553f8920f039e2 /source/blender/src/buttons_editing.c | |
| parent | d5e69a8349af4cd9e4851aba5f5459b2eb2ac534 (diff) | |
Bugfix for #5843 - Wave modifier wont run with negative speed
This is mainly a problem with the interface - it's not clear what effect the
"Time sta:" (more correctly, the time offset) value will have when the speed
is negative. I have updated the UI to change the "Time sta:" button to "Time
end:" when the speed is negative.
Diffstat (limited to 'source/blender/src/buttons_editing.c')
| -rw-r--r-- | source/blender/src/buttons_editing.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index f0d403d61af..1259f7ae27a 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -1775,7 +1775,10 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco uiDefButBitS(block, TOG, WAV_X, B_MODIFIER_RECALC, "X", lx,(cy-=19),45,19, &wmd->flag, 0, 0, 0, 0, "Enable X axis motion"); uiDefButBitS(block, TOG, WAV_Y, B_MODIFIER_RECALC, "Y", lx+45,cy,45,19, &wmd->flag, 0, 0, 0, 0, "Enable Y axis motion"); uiDefButBitS(block, TOG, WAV_CYCL, B_MODIFIER_RECALC, "Cycl", lx+90,cy,buttonWidth-90,19, &wmd->flag, 0, 0, 0, 0, "Enable cyclic wave effect"); - uiDefButF(block, NUM, B_MODIFIER_RECALC, "Time sta:", lx,(cy-=19),buttonWidth,19, &wmd->timeoffs, -1000.0, 1000.0, 100, 0, "Specify startingframe of the wave"); + if(wmd->speed >= 0) + uiDefButF(block, NUM, B_MODIFIER_RECALC, "Time sta:", lx,(cy-=19),buttonWidth,19, &wmd->timeoffs, -1000.0, 1000.0, 100, 0, "Specify starting frame of the wave"); + else + uiDefButF(block, NUM, B_MODIFIER_RECALC, "Time end:", lx,(cy-=19),buttonWidth,19, &wmd->timeoffs, -1000.0, 1000.0, 100, 0, "Specify ending frame of the wave"); uiDefButF(block, NUM, B_MODIFIER_RECALC, "Lifetime:", lx,(cy-=19),buttonWidth,19, &wmd->lifetime, -1000.0, 1000.0, 100, 0, "Specify the lifespan of the wave"); uiDefButF(block, NUM, B_MODIFIER_RECALC, "Damptime:", lx,(cy-=19),buttonWidth,19, &wmd->damp, -1000.0, 1000.0, 100, 0, "Specify the dampingtime of the wave"); cy -= 19; |