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:
authorAaron Carlisle <carlisle.b3d@gmail.com>2022-01-14 21:46:20 +0300
committerAaron Carlisle <carlisle.b3d@gmail.com>2022-01-14 21:46:31 +0300
commitbba95d1901a8d0ed4d2797e87e7a2dc756589b32 (patch)
tree2ea4c5ce3e0d2d37485565d2a4258d8227e0ff0d /source/blender/compositor
parent67517c7d5c08a32d7a2f01bd2804d165aa6963c8 (diff)
Fix possible build error with unity build
`NodeOperationBuilder::Link` could conflict with the list base macros. To resolve this dont use `using Link`.
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/intern/COM_ConstantFolder.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/compositor/intern/COM_ConstantFolder.cc b/source/blender/compositor/intern/COM_ConstantFolder.cc
index ca5fd9e8274..f10bee38a6e 100644
--- a/source/blender/compositor/intern/COM_ConstantFolder.cc
+++ b/source/blender/compositor/intern/COM_ConstantFolder.cc
@@ -28,8 +28,6 @@
namespace blender::compositor {
-using Link = NodeOperationBuilder::Link;
-
ConstantFolder::ConstantFolder(NodeOperationBuilder &operations_builder)
: operations_builder_(operations_builder)
{
@@ -178,8 +176,8 @@ void ConstantFolder::delete_constant_buffers()
void ConstantFolder::get_operation_output_operations(NodeOperation *operation,
Vector<NodeOperation *> &r_outputs)
{
- const Vector<Link> &links = operations_builder_.get_links();
- for (const Link &link : links) {
+ const Vector<NodeOperationBuilder::Link> &links = operations_builder_.get_links();
+ for (const NodeOperationBuilder::Link &link : links) {
if (&link.from()->get_operation() == operation) {
r_outputs.append(&link.to()->get_operation());
}