Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/depsgraph/intern')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations.cc11
-rw-r--r--source/blender/depsgraph/intern/node/deg_node_factory.h2
2 files changed, 1 insertions, 12 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index fcdc3fe58e8..1c09417e9ab 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1475,17 +1475,6 @@ void DepsgraphRelationBuilder::build_animation_images(ID *id)
id, NodeType::IMAGE_ANIMATION, OperationCode::IMAGE_ANIMATION);
TimeSourceKey time_src_key;
add_relation(time_src_key, image_animation_key, "TimeSrc -> Image Animation");
-
- /* The image users of these ids may change during evaluation. Make sure that the image
- * animation update happens after evaluation. */
- if (GS(id->name) == ID_MA) {
- OperationKey material_update_key(id, NodeType::SHADING, OperationCode::MATERIAL_UPDATE);
- add_relation(material_update_key, image_animation_key, "Material Update -> Image Animation");
- }
- else if (GS(id->name) == ID_WO) {
- OperationKey world_update_key(id, NodeType::SHADING, OperationCode::WORLD_UPDATE);
- add_relation(world_update_key, image_animation_key, "World Update -> Image Animation");
- }
}
}
diff --git a/source/blender/depsgraph/intern/node/deg_node_factory.h b/source/blender/depsgraph/intern/node/deg_node_factory.h
index b3153a7ddfb..125f340a0fa 100644
--- a/source/blender/depsgraph/intern/node/deg_node_factory.h
+++ b/source/blender/depsgraph/intern/node/deg_node_factory.h
@@ -55,7 +55,7 @@ template<class ModeObjectType> struct DepsNodeFactoryImpl : public DepsNodeFacto
void register_node_typeinfo(DepsNodeFactory *factory);
/* Get typeinfo for specified type */
-DepsNodeFactory *type_get_factory(NodeType type);
+DepsNodeFactory *type_get_factory(const NodeType type);
} // namespace deg
} // namespace blender