diff options
| author | Joshua Leung <aligorith@gmail.com> | 2011-07-21 04:07:07 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2011-07-21 04:07:07 +0400 |
| commit | 74111ac11c0da9f1c5279e80dd5e90c896ff2bac (patch) | |
| tree | 7d960daf80baa5a533719e4232314c6c6dd45160 /source/blender/editors/space_time | |
| parent | a08a510d6558f203ee21eefb751752a9fa572cee (diff) | |
Attempted bugfix: don't perform any keyframe remapping stuff if
rendering, to prevent any race condition problems
I've noticed some weird and random crashes recently while rendering,
which I suspect have been arising from having an Action Editor open
while rendering. Previously only the timeline was patched against
these problems, though the issues may be more widespread. Hence,
solving this problem at the root cause instead.
Diffstat (limited to 'source/blender/editors/space_time')
| -rw-r--r-- | source/blender/editors/space_time/space_time.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c index 09842870dff..a1347f6c306 100644 --- a/source/blender/editors/space_time/space_time.c +++ b/source/blender/editors/space_time/space_time.c @@ -480,8 +480,7 @@ static void time_main_area_draw(const bContext *C, ARegion *ar) UI_view2d_view_ortho(v2d); /* keyframes */ - if(!G.rendering) /* ANIM_nla_mapping_apply_fcurve() modifies curve data while rendering, possible race condition */ - time_draw_keyframes(C, stime, ar); + time_draw_keyframes(C, stime, ar); /* markers */ UI_view2d_view_orthoSpecial(ar, v2d, 1); |