[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58718] trunk/blender/intern/cycles/ blender/blender_session.cpp: Fix #36235: cycles crash deactivating render layer during rendering.

Brecht Van Lommel brechtvanlommel at pandora.be
Mon Jul 29 17:32:24 CEST 2013


Revision: 58718
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58718
Author:   blendix
Date:     2013-07-29 15:32:24 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
Fix #36235: cycles crash deactivating render layer during rendering.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_session.cpp

Modified: trunk/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_session.cpp	2013-07-29 14:47:23 UTC (rev 58717)
+++ trunk/blender/intern/cycles/blender/blender_session.cpp	2013-07-29 15:32:24 UTC (rev 58718)
@@ -279,6 +279,11 @@
 
 	BL::RenderResult::layers_iterator b_single_rlay;
 	b_rr.layers.begin(b_single_rlay);
+
+	/* layer will be missing if it was disabled in the UI */
+	if(b_single_rlay == b_rr.layers.end())
+		return;
+
 	BL::RenderLayer b_rlay = *b_single_rlay;
 
 	if (do_update_only) {




More information about the Bf-blender-cvs mailing list