Commit: bba95d1901a8d0ed4d2797e87e7a2dc756589b32
Author: Aaron Carlisle
Date: Fri Jan 14 13:46:20 2022 -0500
Branches: master
https://developer.blender.org/rBbba95d1901a8d0ed4d2797e87e7a2dc756589b32
Fix possible build error with unity build
`NodeOperationBuilder::Link` could conflict with the list base macros.
To resolve this dont use `using Link`.
===================================================================
M source/blender/compositor/intern/COM_ConstantFolder.cc
===================================================================
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());
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
