[Bf-blender-cvs] [f7af7704461] blender2.8: Depsgraph: Cleanup, don't use view layer name

[Sergey Sharybin]

Commit: f7af7704461c5c4fd145a6564e5621514f0475b2
Author: Sergey Sharybin
Date:   Thu Nov 23 12:20:31 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBf7af7704461c5c4fd145a6564e5621514f0475b2

Depsgraph: Cleanup, don't use view layer name

Dependency graph is only built per-view-layer now, so no need to store names.
Will speed up operation lookup as well,.

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

M	source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
M	source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
index 77985528c89..71303db54ef 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
@@ -126,14 +126,12 @@ void DepsgraphNodeBuilder::build_view_layer_collections(
 	                                 _1,
 	                                 scene_cow,
 	                                 view_layer_cow),
-	                   DEG_OPCODE_VIEW_LAYER_INIT,
-	                   view_layer->name);
+	                   DEG_OPCODE_VIEW_LAYER_INIT);
 	add_operation_node(comp,
 	                   function_bind(BKE_layer_eval_layer_collection_post,
 	                                 _1,
 	                                 view_layer_cow),
-	                   DEG_OPCODE_VIEW_LAYER_DONE,
-	                   view_layer->name);
+	                   DEG_OPCODE_VIEW_LAYER_DONE);
 	state.parent = NULL;
 	build_layer_collections(&view_layer_cow->layer_collections, &state);
 }
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc
index 2e4ab0f0f84..a7c70bfc098 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc
@@ -104,12 +104,10 @@ void DepsgraphRelationBuilder::build_view_layer_collections(
 
 	OperationKey init_key(&scene_->id,
 	                      DEG_NODE_TYPE_LAYER_COLLECTIONS,
-	                      DEG_OPCODE_VIEW_LAYER_INIT,
-	                      view_layer->name);
+	                      DEG_OPCODE_VIEW_LAYER_INIT);
 	OperationKey done_key(&scene_->id,
 	                      DEG_NODE_TYPE_LAYER_COLLECTIONS,
-	                      DEG_OPCODE_VIEW_LAYER_DONE,
-	                      view_layer->name);
+	                      DEG_OPCODE_VIEW_LAYER_DONE);
 
 	state.init_key = init_key;
 	state.done_key = done_key;