[Bf-blender-cvs] [47c92bf8de5] master: Cleanup: Remove unused boolean in node select function

Hans Goudey noreply at git.blender.org
Sun Nov 20 21:49:09 CET 2022


Commit: 47c92bf8de591a7f4b37cd12b145a9bd83f2b801
Author: Hans Goudey
Date:   Sat Nov 19 15:41:55 2022 -0600
Branches: master
https://developer.blender.org/rB47c92bf8de591a7f4b37cd12b145a9bd83f2b801

Cleanup: Remove unused boolean in node select function

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

M	source/blender/editors/space_node/node_select.cc

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

diff --git a/source/blender/editors/space_node/node_select.cc b/source/blender/editors/space_node/node_select.cc
index f5712cafe6c..2dcbd805622 100644
--- a/source/blender/editors/space_node/node_select.cc
+++ b/source/blender/editors/space_node/node_select.cc
@@ -1243,7 +1243,6 @@ static int node_select_same_type_step_exec(bContext *C, wmOperator *op)
   bNode *active = nodeGetActive(snode->edittree);
   int totnodes;
   const bool revert = RNA_boolean_get(op->ptr, "prev");
-  const bool same_type = true;
 
   ntreeGetDependencyList(snode->edittree, &node_array, &totnodes);
 
@@ -1256,49 +1255,29 @@ static int node_select_same_type_step_exec(bContext *C, wmOperator *op)
       }
     }
 
-    if (same_type) {
-      bNode *node = nullptr;
+    bNode *node = nullptr;
 
-      while (node == nullptr) {
-        if (revert) {
-          a--;
-        }
-        else {
-          a++;
-        }
+    while (node == nullptr) {
+      if (revert) {
+        a--;
+      }
+      else {
+        a++;
+      }
 
-        if (a < 0 || a >= totnodes) {
-          break;
-        }
+      if (a < 0 || a >= totnodes) {
+        break;
+      }
 
-        node = node_array[a];
+      node = node_array[a];
 
-        if (node->type == active->type) {
-          break;
-        }
-        node = nullptr;
-      }
-      if (node) {
-        active = node;
+      if (node->type == active->type) {
+        break;
       }
+      node = nullptr;
     }
-    else {
-      if (revert) {
-        if (a == 0) {
-          active = node_array[totnodes - 1];
-        }
-        else {
-          active = node_array[a - 1];
-        }
-      }
-      else {
-        if (a == totnodes - 1) {
-          active = node_array[0];
-        }
-        else {
-          active = node_array[a + 1];
-        }
-      }
+    if (node) {
+      active = node;
     }
 
     node_select_single(*C, *active);



More information about the Bf-blender-cvs mailing list