Fix build errors on Visual Studio after recent changes.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 31 Jan 2019 18:57:47 +0000 (19:57 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 31 Jan 2019 18:59:13 +0000 (19:59 +0100)
SYNCHRONIZE is a Windows macro.

source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
source/blender/depsgraph/intern/eval/deg_eval.cc
source/blender/depsgraph/intern/node/deg_node.cc
source/blender/depsgraph/intern/node/deg_node.h
source/blender/depsgraph/intern/node/deg_node_component.cc
source/blender/depsgraph/intern/node/deg_node_component.h

index 295303aaeee0c1d3e53fd1e195c202c4a3577a62..e7b0f5906b3a477b687c0486c50b0916c6a2baff 100644 (file)
@@ -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),
index 633646da9183de9f4bb8d06db7f3acae0b453673..f68d8d945f91122baf1a53f03b74217ba684d7ac 100644 (file)
@@ -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");
index 70c49c47395d637aa6fad401e95ab142e099917f..4c1e4e8482b757ffb47c504f44da2434e4638b0b 100644 (file)
@@ -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;
index 0425407d1cdb3fe6b793a012c665d64d942b2ca1..026df17ccc8be124ceacd0487f71db10b7bd7e4a 100644 (file)
@@ -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"
index cfded3d3c90f24f5369af8743fc518e4e6370b7c..7b15bf3f5c651ddffdb37c29f669246f5537f9ba 100644 (file)
@@ -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";
 
index a07990df8622273efddf69cc8eaad2cdb9eaf026..824fcabc802e29450fc5b67539dc37574cfdc48c 100644 (file)
@@ -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,
index b0246295dbb54c592e1e555d5211399922c5f08c..15ba2c76c3ecb1a285c1ff538f932c81cac4356d 100644 (file)
@@ -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);
 }
 
index 7d81b5470d7716c184f837bad9b868cda0d7f037..23e70c9c802b3504e5db35a4757a13959488a5c1 100644 (file)
@@ -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 */