diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-31 21:57:47 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-31 21:59:13 +0300 |
| commit | 7b08c62841bcfebbe2a74a5bf236fcb533f7b067 (patch) | |
| tree | d94a9d2f9346a51a0ef6a1b5f1e5d55208bf0e7b /source/blender/depsgraph/intern/builder | |
| parent | 8c2a978b03f71e759908da0a360b4c7eed329597 (diff) | |
Fix build errors on Visual Studio after recent changes.
SYNCHRONIZE is a Windows macro.
Diffstat (limited to 'source/blender/depsgraph/intern/builder')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 2 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 295303aaeee..e7b0f5906b3 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -657,7 +657,7 @@ void DepsgraphNodeBuilder::build_object(int base_index, } /* Syncronization back to original object. */ add_operation_node(&object->id, - NodeType::SYNCHRONIZE, + NodeType::SYNCHRONIZATION, function_bind(BKE_object_synchronize_to_original, _1, object_cow), diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 633646da918..f68d8d945f9 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -688,7 +688,7 @@ void DepsgraphRelationBuilder::build_object(Base *base, Object *object) build_object_pointcache(object); /* Syncronization back to original object. */ OperationKey synchronize_key(&object->id, - NodeType::SYNCHRONIZE, + NodeType::SYNCHRONIZATION, OperationCode::SYNCHRONIZE_TO_ORIGINAL); add_relation( final_transform_key, synchronize_key, "Synchronize to Original"); @@ -708,7 +708,7 @@ void DepsgraphRelationBuilder::build_object_flags(Base *base, Object *object) add_relation(view_layer_done_key, object_flags_key, "Base flags flush"); /* Syncronization back to original object. */ OperationKey synchronize_key(&object->id, - NodeType::SYNCHRONIZE, + NodeType::SYNCHRONIZATION, OperationCode::SYNCHRONIZE_TO_ORIGINAL); add_relation( object_flags_key, synchronize_key, "Synchronize to Original"); @@ -2113,7 +2113,7 @@ void DepsgraphRelationBuilder::build_object_data_geometry(Object *object) /* Syncronization back to original object. */ ComponentKey final_geometry_jey(&object->id, NodeType::GEOMETRY); OperationKey synchronize_key(&object->id, - NodeType::SYNCHRONIZE, + NodeType::SYNCHRONIZATION, OperationCode::SYNCHRONIZE_TO_ORIGINAL); add_relation( final_geometry_jey, synchronize_key, "Synchronize to Original"); |