Revision: 48681
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48681
Author: campbellbarton
Date: 2012-07-06 14:24:41 +0000 (Fri, 06 Jul 2012)
Log Message:
-----------
fix for rare crash we have with some mango files.
Modified Paths:
--------------
trunk/blender/source/blender/render/intern/source/external_engine.c
Modified: trunk/blender/source/blender/render/intern/source/external_engine.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/external_engine.c
2012-07-06 13:36:54 UTC (rev 48680)
+++ trunk/blender/source/blender/render/intern/source/external_engine.c
2012-07-06 14:24:41 UTC (rev 48681)
@@ -173,13 +173,17 @@
disprect.ymax = y + h;
result = render_result_new(re, &disprect, 0, RR_USE_MEM);
- BLI_addtail(&engine->fullresult, result);
-
- result->tilerect.xmin += re->disprect.xmin;
- result->tilerect.xmax += re->disprect.xmin;
- result->tilerect.ymin += re->disprect.ymin;
- result->tilerect.ymax += re->disprect.ymin;
+ /* can be NULL if we CLAMP the width or height to 0 */
+ if (result) {
+ BLI_addtail(&engine->fullresult, result);
+
+ result->tilerect.xmin += re->disprect.xmin;
+ result->tilerect.xmax += re->disprect.xmin;
+ result->tilerect.ymin += re->disprect.ymin;
+ result->tilerect.ymax += re->disprect.ymin;
+ }
+
return result;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs