[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42764] trunk/blender/source/blender/ render/intern/source/external_engine.c: Fix #25775: crash using border render from external render engines, merging
Brecht Van Lommel
brechtvanlommel at pandora.be
Tue Dec 20 13:25:30 CET 2011
Revision: 42764
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42764
Author: blendix
Date: 2011-12-20 12:25:18 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
Fix #25775: crash using border render from external render engines, merging
back the tile used wrong offsets.
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 2011-12-20 11:37:55 UTC (rev 42763)
+++ trunk/blender/source/blender/render/intern/source/external_engine.c 2011-12-20 12:25:18 UTC (rev 42764)
@@ -190,6 +190,11 @@
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