diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-17 17:28:36 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-17 17:28:36 +0300 |
| commit | 44183a3535237832e9baadd770c3d629bf4c4de5 (patch) | |
| tree | 2bada8c777606216ca3c0c6a6d4d0c6c4f4d1111 /source/blender | |
| parent | 2d89b43fd24986541f6cb2a1580ad8764540af47 (diff) | |
| parent | 9c0a38ee338f0eb2f878df3dc5a1b8c493c4b9ac (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index cd7a80256b7..ce16a986dff 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -191,7 +191,7 @@ static bool particle_system_depends_on_time(ParticleSystem *psys) return false; } -static bool object_particles_depends_oin_time(Object *object) +static bool object_particles_depends_on_time(Object *object) { LINKLIST_FOREACH (ParticleSystem *, psys, &object->particlesystem) { if (particle_system_depends_on_time(psys)) { @@ -1369,10 +1369,9 @@ void DepsgraphRelationBuilder::build_particles(Object *ob) OperationKey eval_init_key(&ob->id, DEG_NODE_TYPE_EVAL_PARTICLES, DEG_OPCODE_PARTICLE_SYSTEM_EVAL_INIT); - /* TODO(sergey): Are all particle systems depends on time? - * Hair without dynamics i.e. - */ - add_relation(time_src_key, eval_init_key, "TimeSrc -> PSys"); + if (object_particles_depends_on_time(ob)) { + add_relation(time_src_key, eval_init_key, "TimeSrc -> PSys"); + } /* particle systems */ LINKLIST_FOREACH (ParticleSystem *, psys, &ob->particlesystem) { @@ -1682,7 +1681,7 @@ void DepsgraphRelationBuilder::build_obdata_geom(Object *ob) * * Ideally we need to get rid of this relation. */ - if (object_particles_depends_oin_time(ob)) { + if (object_particles_depends_on_time(ob)) { TimeSourceKey time_key; OperationKey obdata_ubereval_key(&ob->id, DEG_NODE_TYPE_GEOMETRY, |