diff options
| -rw-r--r-- | source/blender/editors/space_time/space_time.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c index b2e1bfb9b93..b73c08e6542 100644 --- a/source/blender/editors/space_time/space_time.c +++ b/source/blender/editors/space_time/space_time.c @@ -473,7 +473,8 @@ static void time_main_area_draw(const bContext *C, ARegion *ar) UI_view2d_grid_free(grid); /* keyframes */ - time_draw_keyframes(C, stime, ar); + if(!G.rendering) /* ANIM_nla_mapping_apply_fcurve() modifies curve data while rendering, possible race condition */ + time_draw_keyframes(C, stime, ar); /* current frame */ if ((stime->flag & TIME_DRAWFRAMES)==0) flag |= DRAWCFRA_UNIT_SECONDS; |