Depsgraph: Cleamup, reduce indentation level
This commit is contained in:
parent
35c02c08b8
commit
4330027895
Notes:
blender-bot
2023-02-14 09:44:56 +01:00
Referenced by issue #55522, Moving/Deleting collections crash Referenced by issue #55525, don't be able to filter selected in the timeline Referenced by issue #55521, broken play render animation
|
@ -334,51 +334,49 @@ void DepsgraphRelationBuilder::add_forcefield_relations(
|
|||
const char *name)
|
||||
{
|
||||
ListBase *effectors = pdInitEffectors(NULL, scene, object, psys, eff, false);
|
||||
if (effectors != NULL) {
|
||||
LISTBASE_FOREACH (EffectorCache *, eff, effectors) {
|
||||
if (effectors == NULL) {
|
||||
return;
|
||||
}
|
||||
LISTBASE_FOREACH (EffectorCache *, eff, effectors) {
|
||||
if (eff->ob != object) {
|
||||
ComponentKey eff_key(&eff->ob->id, DEG_NODE_TYPE_TRANSFORM);
|
||||
add_relation(eff_key, key, name);
|
||||
}
|
||||
if (eff->psys != NULL) {
|
||||
if (eff->ob != object) {
|
||||
ComponentKey eff_key(&eff->ob->id, DEG_NODE_TYPE_TRANSFORM);
|
||||
ComponentKey eff_key(&eff->ob->id, DEG_NODE_TYPE_EVAL_PARTICLES);
|
||||
add_relation(eff_key, key, name);
|
||||
/* TODO: remove this when/if EVAL_PARTICLES is sufficient
|
||||
* for up to date particles.
|
||||
*/
|
||||
ComponentKey mod_key(&eff->ob->id, DEG_NODE_TYPE_GEOMETRY);
|
||||
add_relation(mod_key, key, name);
|
||||
}
|
||||
else if (eff->psys != psys) {
|
||||
OperationKey eff_key(&eff->ob->id,
|
||||
DEG_NODE_TYPE_EVAL_PARTICLES,
|
||||
DEG_OPCODE_PARTICLE_SYSTEM_EVAL,
|
||||
eff->psys->name);
|
||||
add_relation(eff_key, key, name);
|
||||
}
|
||||
if (eff->psys != NULL) {
|
||||
if (eff->ob != object) {
|
||||
ComponentKey eff_key(&eff->ob->id, DEG_NODE_TYPE_EVAL_PARTICLES);
|
||||
add_relation(eff_key, key, name);
|
||||
|
||||
/* TODO: remove this when/if EVAL_PARTICLES is sufficient
|
||||
* for up to date particles.
|
||||
*/
|
||||
ComponentKey mod_key(&eff->ob->id, DEG_NODE_TYPE_GEOMETRY);
|
||||
add_relation(mod_key, key, name);
|
||||
}
|
||||
else if (eff->psys != psys) {
|
||||
OperationKey eff_key(&eff->ob->id,
|
||||
DEG_NODE_TYPE_EVAL_PARTICLES,
|
||||
DEG_OPCODE_PARTICLE_SYSTEM_EVAL,
|
||||
eff->psys->name);
|
||||
add_relation(eff_key, key, name);
|
||||
}
|
||||
}
|
||||
if (eff->pd->forcefield == PFIELD_SMOKEFLOW && eff->pd->f_source) {
|
||||
ComponentKey trf_key(&eff->pd->f_source->id,
|
||||
DEG_NODE_TYPE_TRANSFORM);
|
||||
add_relation(trf_key, key, "Smoke Force Domain");
|
||||
|
||||
ComponentKey eff_key(&eff->pd->f_source->id,
|
||||
DEG_NODE_TYPE_GEOMETRY);
|
||||
add_relation(eff_key, key, "Smoke Force Domain");
|
||||
}
|
||||
if (add_absorption && (eff->pd->flag & PFIELD_VISIBILITY)) {
|
||||
add_collision_relations(key,
|
||||
scene,
|
||||
object,
|
||||
NULL,
|
||||
true,
|
||||
"Force Absorption");
|
||||
}
|
||||
}
|
||||
if (eff->pd->forcefield == PFIELD_SMOKEFLOW && eff->pd->f_source) {
|
||||
ComponentKey trf_key(&eff->pd->f_source->id,
|
||||
DEG_NODE_TYPE_TRANSFORM);
|
||||
add_relation(trf_key, key, "Smoke Force Domain");
|
||||
ComponentKey eff_key(&eff->pd->f_source->id,
|
||||
DEG_NODE_TYPE_GEOMETRY);
|
||||
add_relation(eff_key, key, "Smoke Force Domain");
|
||||
}
|
||||
if (add_absorption && (eff->pd->flag & PFIELD_VISIBILITY)) {
|
||||
add_collision_relations(key,
|
||||
scene,
|
||||
object,
|
||||
NULL,
|
||||
true,
|
||||
"Force Absorption");
|
||||
}
|
||||
}
|
||||
|
||||
pdEndEffectors(&effectors);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue