[Bf-blender-cvs] [f6e09ae3a2c] compositor-cryptomatte-workflow: Cleanup: clang-tidy errors part 2.

Jeroen Bakker noreply at git.blender.org
Wed Mar 10 11:07:31 CET 2021


Commit: f6e09ae3a2c8c0af046995c1fad968527ed045cb
Author: Jeroen Bakker
Date:   Wed Mar 10 11:07:14 2021 +0100
Branches: compositor-cryptomatte-workflow
https://developer.blender.org/rBf6e09ae3a2c8c0af046995c1fad968527ed045cb

Cleanup: clang-tidy errors part 2.

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

M	source/blender/compositor/nodes/COM_CryptomatteNode.cc

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

diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cc b/source/blender/compositor/nodes/COM_CryptomatteNode.cc
index 5e13ae0757a..2246a3e23a7 100644
--- a/source/blender/compositor/nodes/COM_CryptomatteNode.cc
+++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cc
@@ -99,7 +99,7 @@ void CryptomatteNode::buildInputOperationsFromImageSource(
 
   ImageUser *iuser = &cryptoMatteSettings->iuser;
   BKE_image_user_frame_calc(image, iuser, context.getFramenumber());
-  ImBuf *ibuf = BKE_image_acquire_ibuf(image, iuser, NULL);
+  ImBuf *ibuf = BKE_image_acquire_ibuf(image, iuser, nullptr);
 
   if (image->rr) {
     int view = 0;
@@ -109,8 +109,9 @@ void CryptomatteNode::buildInputOperationsFromImageSource(
          * image. */
         view = BLI_findstringindex(
             &image->rr->views, context.getViewName(), offsetof(RenderView, name));
-        if (view == -1)
+        if (view == -1) {
           view = 0;
+        }
       }
       else {
         view = iuser->view - 1;
@@ -138,7 +139,7 @@ void CryptomatteNode::buildInputOperationsFromImageSource(
       }
     }
   }
-  BKE_image_release_ibuf(image, ibuf, NULL);
+  BKE_image_release_ibuf(image, ibuf, nullptr);
 }
 
 blender::Vector<NodeOperation *> CryptomatteNode::createInputOperations(



More information about the Bf-blender-cvs mailing list