[Bf-blender-cvs] [039792caf35] master: Depsgraph: Use scene operation code

Sergey Sharybin noreply at git.blender.org
Fri Feb 1 15:40:41 CET 2019


Commit: 039792caf35fa3ff57a3712ece28aa1336281766
Author: Sergey Sharybin
Date:   Fri Feb 1 11:00:37 2019 +0100
Branches: master
https://developer.blender.org/rB039792caf35fa3ff57a3712ece28aa1336281766

Depsgraph: Use scene operation code

Hopefully, this is the last one.

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

M	source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.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_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
index 844b98b52a3..fb02a6219db 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
@@ -167,8 +167,7 @@ void DepsgraphNodeBuilder::build_view_layer(
 	add_operation_node(&scene->id,
 	                   NodeType::PARAMETERS,
 	                   NULL,
-	                   OperationCode::PLACEHOLDER,
-	                   "Scene Eval");
+	                   OperationCode::SCENE_EVAL);
 	/* Build all set scenes. */
 	if (scene->set != NULL) {
 		ViewLayer *set_view_layer = BKE_view_layer_default_render(scene->set);
diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc b/source/blender/depsgraph/intern/node/deg_node_operation.cc
index a5066e233f0..325ced54507 100644
--- a/source/blender/depsgraph/intern/node/deg_node_operation.cc
+++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc
@@ -48,6 +48,8 @@ const char *operationCodeAsString(OperationCode opcode)
 		/* Animation, Drivers, etc. */
 		case OperationCode::ANIMATION: return "ANIMATION";
 		case OperationCode::DRIVER: return "DRIVER";
+		/* Scene related. */
+		case OperationCode::SCENE_EVAL: return "SCENE_EVAL";
 		/* Object related. */
 		case OperationCode::OBJECT_BASE_FLAGS: return "OBJECT_BASE_FLAGS";
 		/* Transform. */
diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.h b/source/blender/depsgraph/intern/node/deg_node_operation.h
index 34236817736..f010a40b048 100644
--- a/source/blender/depsgraph/intern/node/deg_node_operation.h
+++ b/source/blender/depsgraph/intern/node/deg_node_operation.h
@@ -60,6 +60,9 @@ enum class OperationCode {
 	/* Driver */
 	DRIVER,
 
+	/* Scene related. ------------------------------------------------------- */
+	SCENE_EVAL,
+
 	/* Object related. ------------------------------------------------------ */
 	OBJECT_BASE_FLAGS,



More information about the Bf-blender-cvs mailing list