Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2021-03-03 15:42:28 +0300
committerJeroen Bakker <jeroen@blender.org>2021-03-03 15:42:28 +0300
commit87da26404f26a482365319681d699c73e032113c (patch)
tree1ffcc62f1d0eb1ea6b33cc6e5303d9f232912245 /source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
parentdcf7313e7320cbb2f1f5808cffb3b10aca1e8335 (diff)
Fix compiler issues introduced in recent commit.
{73af762e9cd595ea708647c02c7e74752d844e80}
Diffstat (limited to 'source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc')
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc15
1 files changed, 6 insertions, 9 deletions
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[] = {