[Bf-blender-cvs] [240a29f529f] compositor-cryptomatte-workflow: Fix crash when switching between image and scene settings.

Jeroen Bakker noreply at git.blender.org
Mon Mar 8 16:22:41 CET 2021


Commit: 240a29f529f0e108ec3fb213d088071c2bba54eb
Author: Jeroen Bakker
Date:   Mon Mar 8 15:58:42 2021 +0100
Branches: compositor-cryptomatte-workflow
https://developer.blender.org/rB240a29f529f0e108ec3fb213d088071c2bba54eb

Fix crash when switching between image and scene settings.

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

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 4374070e02a..a46638a9791 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
@@ -47,7 +47,11 @@ static CryptomatteSession *cryptomatte_init_from_node(const bNode &node, int fra
   switch (node.custom1) {
     case CMP_CRYPTOMATTE_SRC_RENDER: {
       Scene *scene = (Scene *)node.id;
+      if (!scene) {
+        return nullptr;
+      }
       BLI_assert(GS(scene->id.name) == ID_SCE);
+
       Render *render = (scene) ? RE_GetSceneRender(scene) : nullptr;
       RenderResult *render_result = render ? RE_AcquireResultRead(render) : nullptr;
       if (render_result) {



More information about the Bf-blender-cvs mailing list