[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31174] trunk/blender/source/blender/ editors/render/render_internal.c: Bugfix: [#23149] Showing cache instead of rendering with the VSE

[Peter Schlaile]

Revision: 31174
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31174
Author:   schlaile
Date:     2010-08-08 18:47:58 +0200 (Sun, 08 Aug 2010)

Log Message:
-----------
Bugfix: [#23149] Showing cache instead of rendering with the VSE

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_internal.c

Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c	2010-08-08 16:22:29 UTC (rev 31173)
+++ trunk/blender/source/blender/editors/render/render_internal.c	2010-08-08 16:47:58 UTC (rev 31174)
@@ -44,6 +44,7 @@
 #include "BKE_main.h"
 #include "BKE_multires.h"
 #include "BKE_report.h"
+#include "BKE_sequencer.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -413,6 +414,12 @@
 	BKE_image_signal(ima, NULL, IMA_SIGNAL_FREE);
 	BKE_image_backup_render(scene, ima);
 
+	/* cleanup sequencer caches before starting user triggered render.
+	   otherwise, invalidated cache entries can make their way into
+	   the output rendering. We can't put that into RE_BlenderFrame,
+	   since sequence rendering can call that recursively... (peter) */
+	seq_stripelem_cache_cleanup();
+
 	if(RNA_boolean_get(op->ptr, "animation"))
 		RE_BlenderAnim(re, mainp, scene, lay, scene->r.sfra, scene->r.efra, scene->r.frame_step, op->reports);
 	else
@@ -633,6 +640,12 @@
 	/* flush multires changes (for sculpt) */
 	multires_force_render_update(CTX_data_active_object(C));
 
+	/* cleanup sequencer caches before starting user triggered render.
+	   otherwise, invalidated cache entries can make their way into
+	   the output rendering. We can't put that into RE_BlenderFrame,
+	   since sequence rendering can call that recursively... (peter) */
+	seq_stripelem_cache_cleanup();
+
 	/* get editmode results */
 	ED_object_exit_editmode(C, 0);	/* 0 = does not exit editmode */