archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix compiler issues introduced in recent commit.

Browse Source 
{73af762e9cd595ea708647c02c7e74752d844e80}
This commit is contained in:
Jeroen Bakker
2021-03-03 13:42:28 +01:00
parent dcf7313e73
commit 87da26404f
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
View File

@@ -27,18 +27,15 @@
#include "BLI_utildefines.h" #include "BLI_utildefines.h"
#include "node_composite_util.h" #include "node_composite_util.h"
#include <optional>
extern "C" { extern "C" {
static std::optional<CryptomatteEntry *> cryptomatte_find(const NodeCryptomatte &n, static CryptomatteEntry *cryptomatte_find(const NodeCryptomatte &n, float encoded_hash)
float encoded_hash)
{ {
LISTBASE_FOREACH (CryptomatteEntry *, entry, &n.entries) { LISTBASE_FOREACH (CryptomatteEntry *, entry, &n.entries) {
if (entry->encoded_hash == encoded_hash) { 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) 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) static void cryptomatte_remove(NodeCryptomatte &n, float f)
{ {
std::optional<CryptomatteEntry *> entry = cryptomatte_find(n, f); CryptomatteEntry *entry = cryptomatte_find(n, f);
if (!entry) { if (!entry) {
return; return;
} }
BLI_remlink(&n.entries, entry.value()); BLI_remlink(&n.entries, entry);
MEM_freeN(entry.value()); MEM_freeN(entry);
} }
static bNodeSocketTemplate outputs[] = { static bNodeSocketTemplate outputs[] = {