[Bf-blender-cvs] [8290edefadc] master: Cleanup: Use bool instead of int

Hans Goudey noreply at git.blender.org
Wed Nov 17 00:20:37 CET 2021


Commit: 8290edefadcbbacc46807166743741b130e70dd5
Author: Hans Goudey
Date:   Tue Nov 16 17:20:31 2021 -0600
Branches: master
https://developer.blender.org/rB8290edefadcbbacc46807166743741b130e70dd5

Cleanup: Use bool instead of int

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

M	source/blender/editors/space_node/node_edit.cc
M	source/blender/editors/space_node/node_intern.hh

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

diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc
index 3d44d893b88..f36ded22a39 100644
--- a/source/blender/editors/space_node/node_edit.cc
+++ b/source/blender/editors/space_node/node_edit.cc
@@ -1192,7 +1192,7 @@ static bool cursor_isect_multi_input_socket(const float cursor[2], const bNodeSo
 }
 
 /* type is SOCK_IN and/or SOCK_OUT */
-int node_find_indicated_socket(
+bool node_find_indicated_socket(
     SpaceNode *snode, bNode **nodep, bNodeSocket **sockp, const float cursor[2], int in_out)
 {
   rctf rect;
@@ -1224,7 +1224,7 @@ int node_find_indicated_socket(
               if (node == visible_node(snode, &rect)) {
                 *nodep = node;
                 *sockp = sock;
-                return 1;
+                return true;
               }
             }
           }
@@ -1232,7 +1232,7 @@ int node_find_indicated_socket(
             if (node == visible_node(snode, &rect)) {
               *nodep = node;
               *sockp = sock;
-              return 1;
+              return true;
             }
           }
         }
@@ -1245,7 +1245,7 @@ int node_find_indicated_socket(
             if (node == visible_node(snode, &rect)) {
               *nodep = node;
               *sockp = sock;
-              return 1;
+              return true;
             }
           }
         }
@@ -1253,7 +1253,7 @@ int node_find_indicated_socket(
     }
   }
 
-  return 0;
+  return false;
 }
 
 /* ****************** Link Dimming *********************** */
diff --git a/source/blender/editors/space_node/node_intern.hh b/source/blender/editors/space_node/node_intern.hh
index cb2980b7db5..137b2a2a88a 100644
--- a/source/blender/editors/space_node/node_intern.hh
+++ b/source/blender/editors/space_node/node_intern.hh
@@ -265,11 +265,11 @@ bool composite_node_editable(struct bContext *C);
 bool node_has_hidden_sockets(struct bNode *node);
 void node_set_hidden_sockets(struct SpaceNode *snode, bNode *node, int set);
 int node_render_changed_exec(bContext *, struct wmOperator *);
-int node_find_indicated_socket(struct SpaceNode *snode,
-                               struct bNode **nodep,
-                               struct bNodeSocket **sockp,
-                               const float cursor[2],
-                               int in_out);
+bool node_find_indicated_socket(struct SpaceNode *snode,
+                                struct bNode **nodep,
+                                struct bNodeSocket **sockp,
+                                const float cursor[2],
+                                int in_out);
 float node_link_dim_factor(const struct View2D *v2d, const struct bNodeLink *link);
 bool node_link_is_hidden_or_dimmed(const struct View2D *v2d, const struct bNodeLink *link);



More information about the Bf-blender-cvs mailing list