[Bf-blender-cvs] [839422cf1c2] master: Cleanup: Remove unused ID from depsgraph time source

[Sergey Sharybin]

Commit: 839422cf1c2d569ac6e34c04b1f9366b31150878
Author: Sergey Sharybin
Date:   Thu Aug 4 12:18:06 2022 +0200
Branches: master
https://developer.blender.org/rB839422cf1c2d569ac6e34c04b1f9366b31150878

Cleanup: Remove unused ID from depsgraph time source

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

M       source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M       source/blender/depsgraph/intern/builder/deg_builder_relations.h
M       source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc 
b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 91ddd759803..b8563c92e58 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -241,11 +241,6 @@ DepsgraphRelationBuilder::DepsgraphRelationBuilder(Main 
*bmain,
 
 TimeSourceNode *DepsgraphRelationBuilder::get_node(const TimeSourceKey &key) 
const
 {
-  if (key.id) {
-    /* XXX TODO */
-    return nullptr;
-  }
-
   return graph_->time_source;
 }
 
@@ -1977,7 +1972,6 @@ void DepsgraphRelationBuilder::build_rigidbody(Scene 
*scene)
 
 void DepsgraphRelationBuilder::build_particle_systems(Object *object)
 {
-  TimeSourceKey time_src_key;
   OperationKey obdata_ubereval_key(&object->id, NodeType::GEOMETRY, 
OperationCode::GEOMETRY_EVAL);
   OperationKey eval_init_key(
       &object->id, NodeType::PARTICLE_SYSTEM, 
OperationCode::PARTICLE_SYSTEM_INIT);
@@ -3092,7 +3086,6 @@ void 
DepsgraphRelationBuilder::build_copy_on_write_relations(IDNode *id_node)
     return;
   }
 
-  TimeSourceKey time_source_key;
   OperationKey copy_on_write_key(id_orig, NodeType::COPY_ON_WRITE, 
OperationCode::COPY_ON_WRITE);
   /* XXX: This is a quick hack to make Alt-A to work. */
   // add_relation(time_source_key, copy_on_write_key, "Fluxgate capacitor 
hack");
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h 
b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index 7894cf27682..9d0d0135d22 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -85,12 +85,9 @@ struct RootPChanMap;
 struct TimeSourceNode;
 
 struct TimeSourceKey {
-  TimeSourceKey();
-  TimeSourceKey(ID *id);
+  TimeSourceKey() = default;
 
   string identifier() const;
-
-  ID *id;
 };
 
 struct ComponentKey {
diff --git 
a/source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc 
b/source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc
index eeaab623482..13e4b615641 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc
@@ -14,14 +14,6 @@ namespace blender::deg {
 
////////////////////////////////////////////////////////////////////////////////
 /* Time source. */
 
-TimeSourceKey::TimeSourceKey() : id(nullptr)
-{
-}
-
-TimeSourceKey::TimeSourceKey(ID *id) : id(id)
-{
-}
-
 string TimeSourceKey::identifier() const
 {
   return string("TimeSourceKey");

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs