diff options
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_nodes.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index c245c67d1cd..9cae343dcde 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -96,7 +96,6 @@ #include "BKE_pointcache.h" #include "BKE_rigidbody.h" #include "BKE_scene.h" -#include "BKE_sequencer.h" #include "BKE_shader_fx.h" #include "BKE_simulation.h" #include "BKE_sound.h" @@ -110,6 +109,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" +#include "SEQ_sequencer.h" + #include "intern/builder/deg_builder.h" #include "intern/depsgraph.h" #include "intern/depsgraph_type.h" @@ -119,8 +120,7 @@ #include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" -namespace blender { -namespace deg { +namespace blender::deg { /* ************ */ /* Node Builder */ @@ -511,7 +511,7 @@ void DepsgraphNodeBuilder::build_collection(LayerCollection *from_layer_collecti } else if (from_layer_collection == nullptr && !id_node->is_collection_fully_expanded) { /* Initially collection was built from layer now, and was requested - * to not recurs into object. But now it's asked to recurs into all objects. */ + * to not recurse into object. But now it's asked to recurse into all objects. */ } else { return; @@ -1199,7 +1199,7 @@ void DepsgraphNodeBuilder::build_particle_systems(Object *object, bool is_object /* Keyed particle targets. */ if (ELEM(part->phystype, PART_PHYS_KEYED, PART_PHYS_BOIDS)) { LISTBASE_FOREACH (ParticleTarget *, particle_target, &psys->targets) { - if (particle_target->ob == nullptr || particle_target->ob == object) { + if (ELEM(particle_target->ob, nullptr, object)) { continue; } build_object(-1, particle_target->ob, DEG_ID_LINKED_INDIRECTLY, is_object_visible); @@ -1929,5 +1929,4 @@ void DepsgraphNodeBuilder::constraint_walk(bConstraint * /*con*/, } } -} // namespace deg -} // namespace blender +} // namespace blender::deg |