[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30189] trunk/blender/source/blender/ editors/space_time/space_time.c: drawing in the timeline could change bezier keys while rendering, disable.

Campbell Barton ideasman42 at gmail.com
Sat Jul 10 23:09:38 CEST 2010


Revision: 30189
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30189
Author:   campbellbarton
Date:     2010-07-10 23:09:38 +0200 (Sat, 10 Jul 2010)

Log Message:
-----------
drawing in the timeline could change bezier keys while rendering, disable.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_time/space_time.c

Modified: trunk/blender/source/blender/editors/space_time/space_time.c
===================================================================
--- trunk/blender/source/blender/editors/space_time/space_time.c	2010-07-10 19:17:52 UTC (rev 30188)
+++ trunk/blender/source/blender/editors/space_time/space_time.c	2010-07-10 21:09:38 UTC (rev 30189)
@@ -473,7 +473,8 @@
 	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;





More information about the Bf-blender-cvs mailing list