[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43818] trunk/blender/source/blender/nodes /composite/node_composite_tree.c: Enable image and alpha outputs for image nodes by default.

[Lukas Toenne]

Revision: 43818
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43818
Author:   lukastoenne
Date:     2012-02-01 07:44:19 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
Enable image and alpha outputs for image nodes by default. These were made unavailable for render layer nodes with the Combined pass disabled, but the same function also disabled them for image nodes. Fix for bug #30040.

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/composite/node_composite_tree.c

Modified: trunk/blender/source/blender/nodes/composite/node_composite_tree.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/node_composite_tree.c	2012-02-01 07:32:32 UTC (rev 43817)
+++ trunk/blender/source/blender/nodes/composite/node_composite_tree.c	2012-02-01 07:44:19 UTC (rev 43818)
@@ -748,16 +748,16 @@
 					if(rl)
 						force_hidden_passes(node, rl->passflag);
 					else
-						force_hidden_passes(node, 0);
+						force_hidden_passes(node, RRES_OUT_IMAGE|RRES_OUT_ALPHA);
 				}
 				else if(ima->type!=IMA_TYPE_MULTILAYER) {	/* if ->rr not yet read we keep inputs */
-					force_hidden_passes(node, RRES_OUT_Z);
+					force_hidden_passes(node, RRES_OUT_IMAGE|RRES_OUT_ALPHA|RRES_OUT_Z);
 				}
 				else
-					force_hidden_passes(node, 0);
+					force_hidden_passes(node, RRES_OUT_IMAGE|RRES_OUT_ALPHA);
 			}
 			else
-				force_hidden_passes(node, 0);
+				force_hidden_passes(node, RRES_OUT_IMAGE|RRES_OUT_ALPHA);
 		}
 	}