blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Fix build errors on Visual Studio after recent changes. 

SYNCHRONIZE is a Windows macro.
This commit is contained in:
Brecht Van Lommel 2019-01-31 19:57:47 +01:00
parent 8c2a978b03
commit 7b08c62841
8 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View 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),

6
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View 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");

2
source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
View 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;

1
source/blender/depsgraph/intern/eval/deg_eval.cc
View 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"

2
source/blender/depsgraph/intern/node/deg_node.cc
View 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";

2
source/blender/depsgraph/intern/node/deg_node.h
View 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,

4
source/blender/depsgraph/intern/node/deg_node_component.cc
View 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);
}

2
source/blender/depsgraph/intern/node/deg_node_component.h
View 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 */