Partial revert of r46542.

Displaying image layers with flattened names (render_layer.render_pass) can lead to extremely long socket lists, especially with older files that were used with distinct render layers before. In general the flattening of names would be preferable, but it needs a sensible way of limiting the number of displayed outputs. For now the render layer dropdown selection is the best option to ensure usability.

1 files changed, 0 insertions, 3 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 20f53afd69e..62e2cd8b3b7 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6855,13 +6855,10 @@ static void do_versions_nodetree_image_layer_2_64_5(bNodeTree *ntree)
 	
 	for (node = ntree->nodes.first; node; node = node->next) {
 		if (node->type == CMP_NODE_IMAGE) {
-			ImageUser *iuser = (ImageUser *)node->storage;
 			bNodeSocket *sock;
 			for (sock = node->outputs.first; sock; sock = sock->next) {
 				NodeImageLayer *output = MEM_callocN(sizeof(NodeImageLayer), "node image layer");
 				
-				/* take layer index from image user (this is ignored from now on) */
-				output->layer_index = iuser->layer;
 				/* take pass index both from current storage ptr (actually an int) */
 				output->pass_index = GET_INT_FROM_POINTER(sock->storage);