diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-07-14 23:01:40 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-07-14 23:01:40 +0400 |
| commit | f588c49cb55b5787085e2b5a65991efd31ce2dee (patch) | |
| tree | f4ad4fd5b7a9b0c21c0c65fa357e68a3d8f97f31 /source/blender/editors/space_time/space_time.c | |
| parent | 8d131d519bf448bcccddb833c263bc36af22d6b5 (diff) | |
| parent | d4b04fac044b2fe0b6295f271a78c73d57ef0533 (diff) | |
Merged changes in the trunk up to revision 30335.
Diffstat (limited to 'source/blender/editors/space_time/space_time.c')
| -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; |