4 files changed, 12 insertions, 14 deletions
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h
index f0dca4e9b34..dd079415d09 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.h
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.h
@@ -227,12 +227,12 @@ class ExecutionGroup {
    * \note Check if a certain area is available, when not available this are will be checked.
    * \note This method is called from other ExecutionGroup's.
    * \param graph:
-   * \param rect:
+   * \param area:
    * \return [true:false]
    * true: package(s) are scheduled
    * false: scheduling is deferred (depending workpackages are scheduled)
    */
-  bool scheduleAreaWhenPossible(ExecutionSystem *graph, rcti *rect);
+  bool scheduleAreaWhenPossible(ExecutionSystem *graph, rcti *area);
 
   /**
    * \brief add a chunk to the WorkScheduler.
@@ -336,7 +336,7 @@ class ExecutionGroup {
    * \brief compose multiple chunks into a single chunk
    * \return Memorybuffer *consolidated chunk
    */
-  MemoryBuffer *constructConsolidatedMemoryBuffer(MemoryProxy *memoryProxy, rcti *output);
+  MemoryBuffer *constructConsolidatedMemoryBuffer(MemoryProxy *memoryProxy, rcti *rect);
 
   /**
    * \brief initExecution is called just before the execution of the whole graph will be done.
@@ -395,9 +395,9 @@ class ExecutionGroup {
    * After determining the order of the chunks the chunks will be scheduled
    *
    * \see ViewerOperation
-   * \param system:
+   * \param graph:
    */
-  void execute(ExecutionSystem *system);
+  void execute(ExecutionSystem *graph);
 
   /**
    * \brief this method determines the MemoryProxy's where this execution group depends on.
diff --git a/source/blender/compositor/intern/COM_Node.cpp b/source/blender/compositor/intern/COM_Node.cpp
index 31535c5851f..30ebd7e0d4b 100644
--- a/source/blender/compositor/intern/COM_Node.cpp
+++ b/source/blender/compositor/intern/COM_Node.cpp
@@ -130,12 +130,12 @@ bNodeSocket *Node::getEditorInputSocket(int editorNodeInputSocketIndex)
   }
   return NULL;
 }
-bNodeSocket *Node::getEditorOutputSocket(int editorNodeInputSocketIndex)
+bNodeSocket *Node::getEditorOutputSocket(int editorNodeOutputSocketIndex)
 {
   bNodeSocket *bSock = (bNodeSocket *)this->getbNode()->outputs.first;
   int index = 0;
   while (bSock != NULL) {
-    if (index == editorNodeInputSocketIndex) {
+    if (index == editorNodeOutputSocketIndex) {
       return bSock;
     }
     index++;
diff --git a/source/blender/compositor/intern/COM_NodeGraph.cpp b/source/blender/compositor/intern/COM_NodeGraph.cpp
index cb27fa21b4d..01dd662ad11 100644
--- a/source/blender/compositor/intern/COM_NodeGraph.cpp
+++ b/source/blender/compositor/intern/COM_NodeGraph.cpp
@@ -54,10 +54,9 @@ void NodeGraph::from_bNodeTree(const CompositorContext &context, bNodeTree *tree
   add_bNodeTree(context, 0, tree, NODE_INSTANCE_KEY_BASE);
 }
 
-bNodeSocket *NodeGraph::find_b_node_input(bNode *b_group_node, const char *identifier)
+bNodeSocket *NodeGraph::find_b_node_input(bNode *b_node, const char *identifier)
 {
-  for (bNodeSocket *b_sock = (bNodeSocket *)b_group_node->inputs.first; b_sock;
-       b_sock = b_sock->next) {
+  for (bNodeSocket *b_sock = (bNodeSocket *)b_node->inputs.first; b_sock; b_sock = b_sock->next) {
     if (STREQ(b_sock->identifier, identifier)) {
       return b_sock;
     }
@@ -65,10 +64,9 @@ bNodeSocket *NodeGraph::find_b_node_input(bNode *b_group_node, const char *ident
   return NULL;
 }
 
-bNodeSocket *NodeGraph::find_b_node_output(bNode *b_group_node, const char *identifier)
+bNodeSocket *NodeGraph::find_b_node_output(bNode *b_node, const char *identifier)
 {
-  for (bNodeSocket *b_sock = (bNodeSocket *)b_group_node->outputs.first; b_sock;
-       b_sock = b_sock->next) {
+  for (bNodeSocket *b_sock = (bNodeSocket *)b_node->outputs.first; b_sock; b_sock = b_sock->next) {
     if (STREQ(b_sock->identifier, identifier)) {
       return b_sock;
     }
diff --git a/source/blender/compositor/intern/COM_NodeGraph.h b/source/blender/compositor/intern/COM_NodeGraph.h
index 7cbd45bd0b5..7252d546fce 100644
--- a/source/blender/compositor/intern/COM_NodeGraph.h
+++ b/source/blender/compositor/intern/COM_NodeGraph.h
@@ -105,7 +105,7 @@ class NodeGraph {
 
   NodeInputs find_inputs(const NodeRange &node_range, bNodeSocket *b_socket);
   NodeOutput *find_output(const NodeRange &node_range, bNodeSocket *b_socket);
-  void add_bNodeLink(const NodeRange &node_range, bNodeLink *bNodeLink);
+  void add_bNodeLink(const NodeRange &node_range, bNodeLink *b_nodelink);
 
   /* **** Special proxy node type conversions **** */
   /* These nodes are not represented in the node graph themselves,