diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2015-04-14 18:19:07 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2015-04-14 18:19:11 +0300 |
| commit | 2d33057c753117e14e407ed913e2ec04171740bf (patch) | |
| tree | 817bd943579dcb11ecdce1981f8d6a3fafd9ef25 /source/blender/compositor/nodes/COM_ImageNode.cpp | |
| parent | 66e2fc39ce2fbb02eda44775fbaf758d7ddf5834 (diff) | |
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.
Diffstat (limited to 'source/blender/compositor/nodes/COM_ImageNode.cpp')
| -rw-r--r-- | source/blender/compositor/nodes/COM_ImageNode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp index 93ab6dd765a..fdd75033aea 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; |