Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-07-29 19:32:24 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-07-29 19:32:24 +0400
commit6135a7adc811acecd08fe85fb27110d207ea95da (patch)
tree5e0c65596e8ac18e6bd51d029ee285a46257b446
parentb517291fe64016908cf600439a3c0e340b09dba0 (diff)
Fix #36235: cycles crash deactivating render layer during rendering.
-rw-r--r--intern/cycles/blender/blender_session.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 86bdbc0749f..3a46897fcac 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -279,6 +279,11 @@ void BlenderSession::do_write_update_render_tile(RenderTile& rtile, bool do_upda
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) {