[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43079] trunk/blender/source/blender/ render/intern/source/external_engine.c: Fix #29746: cycles crash with border render.
Brecht Van Lommel
brechtvanlommel at pandora.be
Mon Jan 2 17:20:19 CET 2012
Revision: 43079
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43079
Author: blendix
Date: 2012-01-02 16:20:18 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
Fix #29746: cycles crash with border render.
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-01-02 16:18:39 UTC (rev 43078)
+++ trunk/blender/source/blender/render/intern/source/external_engine.c 2012-01-02 16:20:18 UTC (rev 43079)
@@ -170,6 +170,11 @@
result= new_render_result(re, &disprect, 0, RR_USEMEM);
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;
}
@@ -190,11 +195,6 @@
if(!result)
return;
-
- result->tilerect.xmin += re->disprect.xmin;
- result->tilerect.xmax += re->disprect.xmin;
- result->tilerect.ymin += re->disprect.ymin;
- result->tilerect.ymax += re->disprect.ymin;
/* merge. on break, don't merge in result for preview renders, looks nicer */
if(!(re->test_break(re->tbh) && (re->r.scemode & R_PREVIEWBUTS)))
More information about the Bf-blender-cvs
mailing list