From 7b08c62841bcfebbe2a74a5bf236fcb533f7b067 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 31 Jan 2019 19:57:47 +0100 Subject: Fix build errors on Visual Studio after recent changes. SYNCHRONIZE is a Windows macro. --- source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 2 +- source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 6 +++--- .../blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc | 2 +- source/blender/depsgraph/intern/eval/deg_eval.cc | 1 + source/blender/depsgraph/intern/node/deg_node.cc | 2 +- source/blender/depsgraph/intern/node/deg_node.h | 2 +- source/blender/depsgraph/intern/node/deg_node_component.cc | 4 ++-- source/blender/depsgraph/intern/node/deg_node_component.h | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) (limited to 'source/blender/depsgraph') 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"); diff --git a/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc index 70c49c47395..4c1e4e8482b 100644 --- a/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc +++ b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc @@ -424,7 +424,7 @@ static void deg_debug_graphviz_node(const DebugContext &ctx, case NodeType::OBJECT_FROM_LAYER: case NodeType::BATCH_CACHE: case NodeType::DUPLI: - case NodeType::SYNCHRONIZE: + case NodeType::SYNCHRONIZATION: case NodeType::GENERIC_DATABLOCK: { ComponentNode *comp_node = (ComponentNode *)node; diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc index 0425407d1cd..026df17ccc8 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval.cc @@ -34,6 +34,7 @@ #include "PIL_time.h" +#include "BLI_compiler_attrs.h" #include "BLI_utildefines.h" #include "BLI_task.h" #include "BLI_ghash.h" diff --git a/source/blender/depsgraph/intern/node/deg_node.cc b/source/blender/depsgraph/intern/node/deg_node.cc index cfded3d3c90..7b15bf3f5c6 100644 --- a/source/blender/depsgraph/intern/node/deg_node.cc +++ b/source/blender/depsgraph/intern/node/deg_node.cc @@ -86,7 +86,7 @@ const char *nodeTypeAsString(NodeType type) /* Duplication. */ case NodeType::DUPLI: return "DUPLI"; /* Synchronization. */ - case NodeType::SYNCHRONIZE: return "SYNCHRONIZE"; + case NodeType::SYNCHRONIZATION: return "SYNCHRONIZATION"; /* Generic datablock. */ case NodeType::GENERIC_DATABLOCK: return "GENERIC_DATABLOCK"; diff --git a/source/blender/depsgraph/intern/node/deg_node.h b/source/blender/depsgraph/intern/node/deg_node.h index a07990df862..824fcabc802 100644 --- a/source/blender/depsgraph/intern/node/deg_node.h +++ b/source/blender/depsgraph/intern/node/deg_node.h @@ -127,7 +127,7 @@ enum class NodeType { * when duplicator is visible. */ DUPLI, /* Synchronization back to original datablock. */ - SYNCHRONIZE, + SYNCHRONIZATION, /* Total number of meaningful node types. */ NUM_TYPES, diff --git a/source/blender/depsgraph/intern/node/deg_node_component.cc b/source/blender/depsgraph/intern/node/deg_node_component.cc index b0246295dbb..15ba2c76c3e 100644 --- a/source/blender/depsgraph/intern/node/deg_node_component.cc +++ b/source/blender/depsgraph/intern/node/deg_node_component.cc @@ -398,7 +398,7 @@ DEG_COMPONENT_NODE_DEFINE(ShadingParameters, SHADING_PARAMETERS, ID_RECALC_SHADI DEG_COMPONENT_NODE_DEFINE(Transform, TRANSFORM, ID_RECALC_TRANSFORM); DEG_COMPONENT_NODE_DEFINE(ObjectFromLayer, OBJECT_FROM_LAYER, 0); DEG_COMPONENT_NODE_DEFINE(Dupli, DUPLI, 0); -DEG_COMPONENT_NODE_DEFINE(Synchronize, SYNCHRONIZE, 0); +DEG_COMPONENT_NODE_DEFINE(Synchronization, SYNCHRONIZATION, 0); DEG_COMPONENT_NODE_DEFINE(GenericDatablock, GENERIC_DATABLOCK, 0); /* Node Types Register =================================== */ @@ -424,7 +424,7 @@ void deg_register_component_depsnodes() register_node_typeinfo(&DNTI_TRANSFORM); register_node_typeinfo(&DNTI_OBJECT_FROM_LAYER); register_node_typeinfo(&DNTI_DUPLI); - register_node_typeinfo(&DNTI_SYNCHRONIZE); + register_node_typeinfo(&DNTI_SYNCHRONIZATION); register_node_typeinfo(&DNTI_GENERIC_DATABLOCK); } diff --git a/source/blender/depsgraph/intern/node/deg_node_component.h b/source/blender/depsgraph/intern/node/deg_node_component.h index 7d81b5470d7..23e70c9c802 100644 --- a/source/blender/depsgraph/intern/node/deg_node_component.h +++ b/source/blender/depsgraph/intern/node/deg_node_component.h @@ -196,7 +196,7 @@ DEG_COMPONENT_NODE_DECLARE_GENERIC(ShadingParameters); DEG_COMPONENT_NODE_DECLARE_GENERIC(Transform); DEG_COMPONENT_NODE_DECLARE_NO_COW_TAG_ON_UPDATE(ObjectFromLayer); DEG_COMPONENT_NODE_DECLARE_GENERIC(Dupli); -DEG_COMPONENT_NODE_DECLARE_GENERIC(Synchronize); +DEG_COMPONENT_NODE_DECLARE_GENERIC(Synchronization); DEG_COMPONENT_NODE_DECLARE_GENERIC(GenericDatablock); /* Bone Component */ -- cgit v1.2.3