[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37494] trunk/blender/source/blender/ render/intern/source/rendercore.c: correction for own commit r37492

Campbell Barton ideasman42 at gmail.com
Wed Jun 15 04:17:40 CEST 2011


Revision: 37494
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37494
Author:   campbellbarton
Date:     2011-06-15 02:17:39 +0000 (Wed, 15 Jun 2011)
Log Message:
-----------
correction for own commit r37492

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37492

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

Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rendercore.c	2011-06-15 02:14:38 UTC (rev 37493)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c	2011-06-15 02:17:39 UTC (rev 37494)
@@ -2625,7 +2625,7 @@
 		ibuf->depth= 32;
 	}
 	else {
-		if(filter) {
+		if(filter && ibuf->depth != 32) {
 			/* clear alpha added by filtering */
 			IMB_rectfill_alpha(ibuf, 1.0f);
 		}
@@ -2714,7 +2714,6 @@
 	for(ima= G.main->image.first; ima; ima= ima->id.next) {
 		if((ima->id.flag & LIB_DOIT)==0) {
 			ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
-			short is_new_alpha;
 
 			if(!ibuf)
 				continue;




More information about the Bf-blender-cvs mailing list