Commit: e44d784fb55def4579d46b32ebdeccacee36df1c
Author: Jeroen Bakker
Date: Wed Mar 17 08:30:36 2021 +0100
Branches: temp-compositor-cryptomatte-picker
https://developer.blender.org/rBe44d784fb55def4579d46b32ebdeccacee36df1c
Fixed incorrect merge
===================================================================
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 a75603601da..f00ac9b97fb 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
@@ -207,6 +207,7 @@ void ntreeCompositCryptomatteLayerPrefix(const bNode *node,
char *r_prefix, size
if (layer_name == node_cryptomatte->layer_name) {
BLI_strncpy(r_prefix, node_cryptomatte->layer_name, prefix_len);
+ return;
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
