Revision: 48683
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48683
Author: campbellbarton
Date: 2012-07-06 14:26:22 +0000 (Fri, 06 Jul 2012)
Log Message:
-----------
fix for crash when render result is NULL
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp
2012-07-06 14:25:49 UTC (rev 48682)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_session.cpp
2012-07-06 14:26:22 UTC (rev 48683)
@@ -199,6 +199,12 @@
/* get render result */
BL::RenderResult b_rr = begin_render_result(b_engine, x, y, w, h,
b_rlay_name.c_str());
+
+ /* can happen if the intersected rectangle gives 0 width or height */
+ if (b_rr.ptr.data == NULL) {
+ return;
+ }
+
BL::RenderResult::layers_iterator b_single_rlay;
b_rr.layers.begin(b_single_rlay);
BL::RenderLayer b_rlay = *b_single_rlay;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
