diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-13 08:14:35 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-13 08:14:35 +0400 |
| commit | 2d1a05874b46d31ee3598ec786a77b45512d99e1 (patch) | |
| tree | f0c453f231b52b5898911f77365d908145da8460 /source/blender/editors/screen | |
| parent | 7be1cd733dfe064d1976b706610c39f97e536b90 (diff) | |
| parent | 399ad54204ad9c3bc9dbd15ec4840824d224dc0c (diff) | |
svn merge ^/trunk/blender -r44024:44076
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index e18851893bd..22bac3a6699 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -44,6 +44,7 @@ #include "DNA_curve_types.h" #include "DNA_scene_types.h" #include "DNA_meta_types.h" +#include "DNA_userdef_types.h" #include "BKE_context.h" #include "BKE_customdata.h" @@ -1819,8 +1820,9 @@ static int frame_offset_exec(bContext *C, wmOperator *op) delta = RNA_int_get(op->ptr, "delta"); - scene->r.cfra += delta; - scene->r.subframe = 0.f; + CFRA += delta; + FRAMENUMBER_MIN_CLAMP(CFRA); + SUBFRA = 0.f; sound_seek_scene(bmain, scene); |