[Bf-blender-cvs] [cdf949668a9] compositor-cryptomatte-workflow: Cleanup: clang-tiny errors.

[Jeroen Bakker]

Commit: cdf949668a9f9d68f27c40fa16248f495f3ad848
Author: Jeroen Bakker
Date:   Wed Mar 10 10:44:00 2021 +0100
Branches: compositor-cryptomatte-workflow
https://developer.blender.org/rBcdf949668a9f9d68f27c40fa16248f495f3ad848

Cleanup: clang-tiny errors.

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

M	source/blender/blenkernel/intern/node.cc
M	source/blender/editors/include/ED_node.h
M	source/blender/editors/space_node/node_view.c
M	source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc

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

diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index cb2f0f77424..60a2a8c465d 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -4973,14 +4973,10 @@ void BKE_nodetree_remove_layer_n(bNodeTree *ntree, Scene *scene, const int layer
   BLI_assert(layer_index != -1);
   LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
     /* Check whether this node references layers. */
-    short *node_index = NULL;
+    short *node_index = nullptr;
     if (node->type == CMP_NODE_R_LAYERS && (Scene *)node->id == scene) {
       node_index = &node->custom1;
     }
-    else if (node->type == CMP_NODE_CRYPTOMATTE && node->custom1 == CMP_CRYPTOMATTE_SRC_RENDER &&
-             (Scene *)node->id == scene) {
-      node_index = &node->custom2;
-    }
 
     /* If it does, ensure that it remains valid. */
     if (node_index) {
diff --git a/source/blender/editors/include/ED_node.h b/source/blender/editors/include/ED_node.h
index 59e22881efe..67a50b83bd6 100644
--- a/source/blender/editors/include/ED_node.h
+++ b/source/blender/editors/include/ED_node.h
@@ -124,7 +124,7 @@ void ED_operatormacros_node(void);
 bool ED_space_node_get_position(struct Main *bmain,
                                 struct SpaceNode *snode,
                                 struct ARegion *region,
-                                int mval[2],
+                                const int mval[2],
                                 float fpos[2]);
 bool ED_space_node_color_sample(struct Main *bmain,
                                 struct SpaceNode *snode,
diff --git a/source/blender/editors/space_node/node_view.c b/source/blender/editors/space_node/node_view.c
index e0d91639f48..8ecab92aa26 100644
--- a/source/blender/editors/space_node/node_view.c
+++ b/source/blender/editors/space_node/node_view.c
@@ -445,7 +445,7 @@ static void sample_draw(const bContext *C, ARegion *region, void *arg_info)
 
 /* Returns mouse position in image space. */
 bool ED_space_node_get_position(
-    Main *bmain, SpaceNode *snode, struct ARegion *ar, int mval[2], float fpos[2])
+    Main *bmain, SpaceNode *snode, struct ARegion *ar, const int mval[2], float fpos[2])
 {
   if (!ED_node_is_compositor(snode) || (snode->flag & SNODE_BACKDRAW) == 0) {
     return false;
diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
index ae7b48cdfbe..68f9d0f294f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
@@ -84,13 +84,13 @@ static blender::bke::cryptomatte::CryptomatteSessionPtr cryptomatte_init_from_no
 
       ImageUser *iuser = &node_cryptomatte->iuser;
       BKE_image_user_frame_calc(image, iuser, frame_number);
-      ImBuf *ibuf = BKE_image_acquire_ibuf(image, iuser, NULL);
+      ImBuf *ibuf = BKE_image_acquire_ibuf(image, iuser, nullptr);
       RenderResult *render_result = image->rr;
       if (render_result) {
         session = blender::bke::cryptomatte::CryptomatteSessionPtr(
             BKE_cryptomatte_init_from_render_result(render_result));
       }
-      BKE_image_release_ibuf(image, ibuf, NULL);
+      BKE_image_release_ibuf(image, ibuf, nullptr);
       break;
     }
   }
@@ -255,11 +255,13 @@ static bool node_poll_cryptomatte(bNodeType *UNUSED(ntype), bNodeTree *ntree)
 
     /* See node_composit_poll_rlayers. */
     for (scene = static_cast<Scene *>(G.main->scenes.first); scene;
-         scene = static_cast<Scene *>(scene->id.next))
-      if (scene->nodetree == ntree)
+         scene = static_cast<Scene *>(scene->id.next)) {
+      if (scene->nodetree == ntree) {
         break;
+      }
+    }
 
-    return (scene != NULL);
+    return scene != nullptr;
   }
   return false;
 }