[Bf-blender-cvs] [87da26404f2] master: Fix compiler issues introduced in recent commit.
Jeroen Bakker
noreply at git.blender.org
Wed Mar 3 13:42:59 CET 2021
Commit: 87da26404f26a482365319681d699c73e032113c
Author: Jeroen Bakker
Date: Wed Mar 3 13:42:28 2021 +0100
Branches: master
https://developer.blender.org/rB87da26404f26a482365319681d699c73e032113c
Fix compiler issues introduced in recent commit.
{73af762e9cd595ea708647c02c7e74752d844e80}
===================================================================
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 d25bbb4c240..84cd84e41c7 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
@@ -27,18 +27,15 @@
#include "BLI_utildefines.h"
#include "node_composite_util.h"
-#include <optional>
-
extern "C" {
-static std::optional<CryptomatteEntry *> cryptomatte_find(const NodeCryptomatte &n,
- float encoded_hash)
+static CryptomatteEntry *cryptomatte_find(const NodeCryptomatte &n, float encoded_hash)
{
LISTBASE_FOREACH (CryptomatteEntry *, entry, &n.entries) {
if (entry->encoded_hash == encoded_hash) {
- return std::make_optional(entry);
+ return entry;
}
}
- return std::nullopt;
+ return nullptr;
}
static void cryptomatte_add(NodeCryptomatte &n, float f)
@@ -55,12 +52,12 @@ static void cryptomatte_add(NodeCryptomatte &n, float f)
static void cryptomatte_remove(NodeCryptomatte &n, float f)
{
- std::optional<CryptomatteEntry *> entry = cryptomatte_find(n, f);
+ CryptomatteEntry *entry = cryptomatte_find(n, f);
if (!entry) {
return;
}
- BLI_remlink(&n.entries, entry.value());
- MEM_freeN(entry.value());
+ BLI_remlink(&n.entries, entry);
+ MEM_freeN(entry);
}
static bNodeSocketTemplate outputs[] = {
More information about the Bf-blender-cvs
mailing list