Revision: 43130
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43130
Author:   nazgul
Date:     2012-01-04 15:28:03 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
Fix #29764: Crash when border rendering in sequencer. (Not Cycles related)

Sequencer render context should be as large as the whole frame when rendering
using border without clipping.

Can be implemented in more clear way but it'll require more global refactoring.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c        
2012-01-04 15:25:43 UTC (rev 43129)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c        
2012-01-04 15:28:03 UTC (rev 43130)
@@ -2538,9 +2538,17 @@
 
        recurs_depth++;
 
-       context = seq_new_render_data(re->main, re->scene,
-                                     re->result->rectx, re->result->recty, 
-                                     100);
+       if((re->r.mode & R_BORDER) && (re->r.mode & R_CROP)==0) {
+               /* if border rendering is used and cropping is disabled, final 
buffer should
+                   be as large as the whole frame */
+               context = seq_new_render_data(re->main, re->scene,
+                                             re->winx, re->winy,
+                                             100);
+       } else {
+               context = seq_new_render_data(re->main, re->scene,
+                                             re->result->rectx, 
re->result->recty,
+                                             100);
+       }
 
        ibuf = give_ibuf_seq(context, cfra, 0);
 

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to