[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26609] branches/render25/source/blender/ render/intern/source/pipeline.c: Render Branch: fix memory leak when cancelling preview render.

Brecht Van Lommel brecht at blender.org
Thu Feb 4 21:33:04 CET 2010


Revision: 26609
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26609
Author:   blendix
Date:     2010-02-04 21:33:04 +0100 (Thu, 04 Feb 2010)

Log Message:
-----------
Render Branch: fix memory leak when cancelling preview render.

Modified Paths:
--------------
    branches/render25/source/blender/render/intern/source/pipeline.c

Modified: branches/render25/source/blender/render/intern/source/pipeline.c
===================================================================
--- branches/render25/source/blender/render/intern/source/pipeline.c	2010-02-04 19:24:20 UTC (rev 26608)
+++ branches/render25/source/blender/render/intern/source/pipeline.c	2010-02-04 20:33:04 UTC (rev 26609)
@@ -677,6 +677,13 @@
 
 		BLI_end_threads(&threads);
 
+		/* in case we cancelled, free remaining results */
+		while(BLI_thread_queue_size(donequeue)) {
+			pa= BLI_thread_queue_pop(donequeue);
+			render_result_free(&pa->fullresult, pa->result);
+			pa->result= NULL;
+		}
+
 		if((g_break=test_break(re->cb.tbh)))
 			break;
 	}





More information about the Bf-blender-cvs mailing list