[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54490] trunk/blender/source/blender/ blenkernel/intern/image.c: Fix incorrect display of Sequence layer when rendering animation and

Sergey Sharybin sergey.vfx at gmail.com
Tue Feb 12 12:45:16 CET 2013


Revision: 54490
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54490
Author:   nazgul
Date:     2013-02-12 11:45:16 +0000 (Tue, 12 Feb 2013)
Log Message:
-----------
Fix incorrect display of Sequence layer when rendering animation and
float/byte render results were mixed.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2013-02-12 11:44:02 UTC (rev 54489)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2013-02-12 11:45:16 UTC (rev 54490)
@@ -2737,6 +2737,14 @@
 	if (rres.have_combined && layer == 0) {
 		/* pass */
 	}
+	else if (rect && layer == 0) {
+		/* rect32 is set when there's a Sequence pass, this pass seems
+		 * to have layer=0 (this is from image_buttons.c)
+		 * in this case we ignore float buffer, because it could have
+		 * hung from previous pass which was float
+		 */
+		rectf = NULL;
+	}
 	else if (rres.layers.first) {
 		RenderLayer *rl = BLI_findlink(&rres.layers, layer - (rres.have_combined ? 1 : 0));
 		if (rl) {




More information about the Bf-blender-cvs mailing list