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

Fix possible build error with unity build

Browse Source 
`NodeOperationBuilder::Link` could conflict with the list base macros.
To resolve this dont use `using Link`.
This commit is contained in:
Aaron Carlisle
2022-01-14 13:46:20 -05:00
parent 67517c7d5c
commit bba95d1901
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/compositor/intern/COM_ConstantFolder.cc
View File

@@ -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());
}