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:
authorOmar Emara <mail@OmarEmara.dev>2022-08-10 15:58:51 +0300
committerOmar Emara <mail@OmarEmara.dev>2022-08-10 15:58:51 +0300
commit5689dda6f766b0a49c235ed917d113e2bfdab7a4 (patch)
tree68e99410dd6099a3257097aab50e0449b450df5e /source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
parent27b9538e445d435c57fa2833579f0e4bbf618d79 (diff)
Compositor: Limit C linkage of cryptomatte functions
Most of the functions in the compositor cryptomatte file are declared with extern "C" linkage, which can cause symbol conflict even when functions exist in separate namespaces. This is not actually necessary, as the declaration of the few functions that require C linkage are already declared as such in the header file, so this patch removes the extern C scope from that file. Differential Revision: https://developer.blender.org/D15656 Reviewed By: Clement Foucault
Diffstat (limited to 'source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc')
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
index a00f6fd4fcd..7e5544381a4 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
@@ -107,7 +107,6 @@ static blender::bke::cryptomatte::CryptomatteSessionPtr cryptomatte_init_from_no
return session;
}
-extern "C" {
static CryptomatteEntry *cryptomatte_find(const NodeCryptomatte &n, float encoded_hash)
{
LISTBASE_FOREACH (CryptomatteEntry *, entry, &n.entries) {
@@ -428,4 +427,3 @@ void register_node_type_cmp_cryptomatte_legacy()
}
/** \} */
-}