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:
authorCampbell Barton <ideasman42@gmail.com>2012-09-15 10:29:32 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-15 10:29:32 +0400
commit77ed2d8ca9af8bb646ceb56f47e7a9e21d1eaaee (patch)
tree9f7bf0a150b958f0a56ed9eae00fbc516618a6ac /source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
parentaa364bb366d8c0d6566ffacd59d881a8bab8657b (diff)
code cleanup: remove paranoid NULL checks (these cases would crash earlier of the vars were in fact NULL)
Diffstat (limited to 'source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp')
-rw-r--r--source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp b/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
index e41361fcb2e..bedbfc72722 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
@@ -79,14 +79,10 @@ void ExecutionSystemHelper::addNode(vector<Node *>& nodes, Node *node)
Node *ExecutionSystemHelper::addNode(vector<Node *>& nodes, bNode *b_node, bool inActiveGroup, bool fast)
{
- Node *node;
- node = Converter::convert(b_node, fast);
+ Node *node = Converter::convert(b_node, fast);
node->setIsInActiveGroup(inActiveGroup);
- if (node != NULL) {
- addNode(nodes, node);
- return node;
- }
- return NULL;
+ addNode(nodes, node);
+ return node;
}
void ExecutionSystemHelper::addOperation(vector<NodeOperation *>& operations, NodeOperation *operation)
{