[Bf-blender-cvs] [4a306741025] master: Depsgraph: Use operation code for dupli-group

[Sergey Sharybin]

Commit: 4a3067410250eeae578b87a5d4f629fa1455bc43
Author: Sergey Sharybin
Date:   Fri Feb 1 10:54:37 2019 +0100
Branches: master
https://developer.blender.org/rB4a3067410250eeae578b87a5d4f629fa1455bc43

Depsgraph: Use operation code for dupli-group

===================================================================

M	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M	source/blender/depsgraph/intern/node/deg_node_operation.cc
M	source/blender/depsgraph/intern/node/deg_node_operation.h

===================================================================

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 408b21a7fb9..01ce2f82335 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -647,8 +647,7 @@ void DepsgraphNodeBuilder::build_object(int base_index,
 		add_operation_node(&object->id,
 		                   NodeType::DUPLI,
 		                   NULL,
-		                   OperationCode::PLACEHOLDER,
-		                   "Dupli");
+		                   OperationCode::DUPLI);
 	}
 	/* Syncronization back to original object. */
 	add_operation_node(&object->id,
diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc b/source/blender/depsgraph/intern/node/deg_node_operation.cc
index 72256e35ea8..cf4671bf72b 100644
--- a/source/blender/depsgraph/intern/node/deg_node_operation.cc
+++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc
@@ -123,6 +123,8 @@ const char *operationCodeAsString(OperationCode opcode)
 		/* Generic datablock. */
 		case OperationCode::GENERIC_DATABLOCK_UPDATE:
 			return "GENERIC_DATABLOCK_UPDATE";
+		/* instancing/duplication. */
+		case OperationCode::DUPLI: return "DUPLI";
 	}
 	BLI_assert(!"Unhandled operation code, should never happen.");
 	return "UNKNOWN";
diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.h b/source/blender/depsgraph/intern/node/deg_node_operation.h
index 30818c20d69..7a6df7cf161 100644
--- a/source/blender/depsgraph/intern/node/deg_node_operation.h
+++ b/source/blender/depsgraph/intern/node/deg_node_operation.h
@@ -174,6 +174,9 @@ enum class OperationCode {
 
 	/* Generic datablock ---------------------------------------------------- */
 	GENERIC_DATABLOCK_UPDATE,
+
+	/* Duplication/instancing system. --------------------------------------- */
+	DUPLI,
 };
 const char *operationCodeAsString(OperationCode opcode);