[Bf-blender-cvs] [5811526b41f] compositor-cryptomatte-workflow: Replaced nullptr with uniqueptr.

Jeroen Bakker noreply at git.blender.org
Tue Mar 9 15:53:27 CET 2021


Commit: 5811526b41f3f5175dab73912d1a2cd9cf0ca754
Author: Jeroen Bakker
Date:   Tue Mar 9 15:52:56 2021 +0100
Branches: compositor-cryptomatte-workflow
https://developer.blender.org/rB5811526b41f3f5175dab73912d1a2cd9cf0ca754

Replaced nullptr with uniqueptr.

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

M	source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc

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

diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
index 3c899234672..ae7b48cdfbe 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
@@ -41,17 +41,17 @@
 static blender::bke::cryptomatte::CryptomatteSessionPtr cryptomatte_init_from_node(
     const bNode &node, const int frame_number, const bool use_meta_data)
 {
+  blender::bke::cryptomatte::CryptomatteSessionPtr session;
   if (node.type != CMP_NODE_CRYPTOMATTE) {
-    return nullptr;
+    return session;
   }
 
   NodeCryptomatte *node_cryptomatte = static_cast<NodeCryptomatte *>(node.storage);
-  blender::bke::cryptomatte::CryptomatteSessionPtr session;
   switch (node.custom1) {
     case CMP_CRYPTOMATTE_SRC_RENDER: {
       Scene *scene = (Scene *)node.id;
       if (!scene) {
-        return nullptr;
+        return session;
       }
       BLI_assert(GS(scene->id.name) == ID_SCE);



More information about the Bf-blender-cvs mailing list