diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-04-07 19:48:33 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-04-07 19:48:33 +0400 |
| commit | ba44bf522cd098c8568a8dea4218b91b8d161191 (patch) | |
| tree | 254f4a03b62021e0f4252c8032c913c846482214 /source/blender/editors/animation | |
| parent | 545b0a483dc62c61181c0a0683646c4532f1661e (diff) | |
Bugfix #26812
On anim-render, a click in timeline stopped render completely.
The reason for this was a bit wacko code to cope with frame-step
feature (steps of multiple frames).
I thought of fixing that, but instead decided to block any operator
in Blender to change a frame while a render is in progress.
Both render engine and UI are accessing (writing to) the same
data then, which is a bad conflict.
Still a serious weakness of threaded render, but I'll keep
trying to allow this as far as possible :)
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_ops.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c index a2579613297..ff9521f1ebd 100644 --- a/source/blender/editors/animation/anim_ops.c +++ b/source/blender/editors/animation/anim_ops.c @@ -42,6 +42,7 @@ #include "DNA_scene_types.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_sound.h" #include "UI_view2d.h" @@ -64,6 +65,9 @@ static int change_frame_poll(bContext *C) { ScrArea *curarea= CTX_wm_area(C); + /* XXX temp? prevent changes during render */ + if(G.rendering) return 0; + /* as long as there is an active area, and it isn't a Graph Editor * (since the Graph Editor has its own version which does extra stuff), * we're fine |