[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52644] trunk/blender/intern/cycles/render /session.cpp: Fix #33337: cycles crash with progressive refine and multiple render layers.
Brecht Van Lommel
brechtvanlommel at pandora.be
Wed Nov 28 20:57:29 CET 2012
Revision: 52644
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52644
Author: blendix
Date: 2012-11-28 19:57:29 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
Fix #33337: cycles crash with progressive refine and multiple render layers.
Modified Paths:
--------------
trunk/blender/intern/cycles/render/session.cpp
Modified: trunk/blender/intern/cycles/render/session.cpp
===================================================================
--- trunk/blender/intern/cycles/render/session.cpp 2012-11-28 19:37:37 UTC (rev 52643)
+++ trunk/blender/intern/cycles/render/session.cpp 2012-11-28 19:57:29 UTC (rev 52644)
@@ -637,6 +637,15 @@
reset_gpu(buffer_params, samples);
else
reset_cpu(buffer_params, samples);
+
+ if(params.progressive_refine) {
+ thread_scoped_lock buffers_lock(buffers_mutex);
+
+ foreach(RenderBuffers *buffers, tile_buffers)
+ delete buffers;
+
+ tile_buffers.clear();
+ }
}
void Session::set_samples(int samples)
More information about the Bf-blender-cvs
mailing list