From 74111ac11c0da9f1c5279e80dd5e90c896ff2bac Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Thu, 21 Jul 2011 00:07:07 +0000 Subject: 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. --- source/blender/editors/space_time/space_time.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source/blender/editors/space_time/space_time.c') 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); -- cgit v1.2.3