[Bf-blender-cvs] [25b2b6724d1] master: Fix T74224: Add missing depsgraph relations for boid particles
Jacques Lucke
noreply at git.blender.org
Wed Apr 1 16:22:13 CEST 2020
Commit: 25b2b6724d19d6f1f46b0489f58d03215127aeef
Author: Jacques Lucke
Date: Wed Apr 1 16:21:34 2020 +0200
Branches: master
https://developer.blender.org/rB25b2b6724d19d6f1f46b0489f58d03215127aeef
Fix T74224: Add missing depsgraph relations for boid particles
Reviewers: brecht
Differential Revision: https://developer.blender.org/D7302
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index f2108b3ad6c..128b2d3a9bf 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -1164,7 +1164,7 @@ void DepsgraphNodeBuilder::build_particle_systems(Object *object, bool is_object
/* Particle system evaluation. */
add_operation_node(psys_comp, OperationCode::PARTICLE_SYSTEM_EVAL, nullptr, psys->name);
/* Keyed particle targets. */
- if (part->phystype == PART_PHYS_KEYED) {
+ 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) {
continue;
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 40fbfbc2b99..9258af3e164 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1789,7 +1789,7 @@ void DepsgraphRelationBuilder::build_particle_systems(Object *object)
}
}
/* Keyed particle targets. */
- if (part->phystype == PART_PHYS_KEYED) {
+ 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) {
continue;
More information about the Bf-blender-cvs
mailing list