Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-09-13 13:00:14 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-09-13 13:46:19 +0300
commitf472aea92202406dbec3115af3e1bd526643917e (patch)
treec03b11dc37a40aaa97731a0e8359ea811a677613 /source/blender/compositor/nodes
parent17a117c7a002511b814be118c6f47d531b56ea68 (diff)
Compositor: Cleanup, get rid of nested ternary operators
Having single switch statement is much more readable.
Diffstat (limited to 'source/blender/compositor/nodes')
-rw-r--r--source/blender/compositor/nodes/COM_RenderLayersNode.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
index b9ad083a863..83049c21b0a 100644
--- a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
+++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
@@ -94,7 +94,16 @@ void RenderLayersNode::testRenderLink(NodeConverter &converter,
is_preview = false;
}
else {
- DataType type = ((rpass->channels == 4)? COM_DT_COLOR : ((rpass->channels == 3)? COM_DT_VECTOR : COM_DT_VALUE));
+ DataType type;
+ switch (rpass->channels) {
+ case 4: type = COM_DT_COLOR; break;
+ case 3: type = COM_DT_VECTOR; break;
+ case 1: type = COM_DT_VALUE; break;
+ default:
+ BLI_assert(!"Unexpected number of channels for pass");
+ type = COM_DT_VALUE;
+ break;
+ }
operation = new RenderLayersProg(rpass->name,
type,
rpass->channels);