[Bf-blender-cvs] [2d33057] master: Multiview: compositor openexr multiview images fully working

[Dalai Felinto]

Commit: 2d33057c753117e14e407ed913e2ec04171740bf
Author: Dalai Felinto
Date:   Tue Apr 14 12:19:07 2015 -0300
Branches: master
https://developer.blender.org/rB2d33057c753117e14e407ed913e2ec04171740bf

Multiview: compositor openexr multiview images fully working

This is from my original missing-bits/TODO list.
Basically multiview openexr was only working when multiview was on.

===================================================================

M	source/blender/compositor/nodes/COM_ImageNode.cpp

===================================================================

diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp
index 93ab6dd..fdd7503 100644
--- a/source/blender/compositor/nodes/COM_ImageNode.cpp
+++ b/source/blender/compositor/nodes/COM_ImageNode.cpp
@@ -97,8 +97,7 @@ void ImageNode::convertToOperations(NodeConverter &converter, const CompositorCo
 					socket = this->getOutputSocket(index);
 					bNodeSocket *bnodeSocket = socket->getbNodeSocket();
 					RenderPass *rpass = (RenderPass *)BLI_findstring(&rl->passes, bnodeSocket->identifier, offsetof(RenderPass, internal_name));
-
-					int view = (rpass ? rpass->view_id : 0);
+					int view = 0;
 
 					/* Passes in the file can differ from passes stored in sockets (#36755).
 					 * Look up the correct file pass using the socket identifier instead.
@@ -118,6 +117,7 @@ void ImageNode::convertToOperations(NodeConverter &converter, const CompositorCo
 							/* heuristic to match image name with scene names
 							 * check if the view name exists in the image */
 							view = BLI_findstringindex(&image->rr->views, context.getViewName(), offsetof(RenderView, name));
+							if (view == -1) view = 0;
 						}
 						else {
 							view = view_image - 1;