From ae1f8315f77b34c9e658697e4d7083355c216f60 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 31 Mar 2022 13:02:33 +1100 Subject: Depsgraph: minor optimization in order of checks Checking BKE_image_user_id_has_animation loops over ID users which never needs to run for material & world data-blocks. --- source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 2 +- source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 76bfd216c03..4782f1c4a5d 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -1085,7 +1085,7 @@ void DepsgraphNodeBuilder::build_animation_images(ID *id) * tree. */ const bool can_have_gpu_material = ELEM(GS(id->name), ID_MA, ID_WO); - if (BKE_image_user_id_has_animation(id) || can_have_gpu_material) { + if (can_have_gpu_material || BKE_image_user_id_has_animation(id)) { ID *id_cow = get_cow_id(id); add_operation_node( id, diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 04fb14515dc..487f096031e 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -1423,7 +1423,7 @@ void DepsgraphRelationBuilder::build_animation_images(ID *id) const bool can_have_gpu_material = ELEM(GS(id->name), ID_MA, ID_WO); /* TODO: can we check for existence of node for performance? */ - if (BKE_image_user_id_has_animation(id) || can_have_gpu_material) { + if (can_have_gpu_material || BKE_image_user_id_has_animation(id)) { OperationKey image_animation_key( id, NodeType::IMAGE_ANIMATION, OperationCode::IMAGE_ANIMATION); TimeSourceKey time_src_key; -- cgit v1.2.3