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/node | |
| parent | 8c2a978b03f71e759908da0a360b4c7eed329597 (diff) | |
Fix build errors on Visual Studio after recent changes.
SYNCHRONIZE is a Windows macro.
Diffstat (limited to 'source/blender/depsgraph/intern/node')
4 files changed, 5 insertions, 5 deletions
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 */ |