diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2019-01-11 15:13:55 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2019-01-23 22:47:43 +0300 |
| commit | 32c2e941e639c6e6e6eb5c60ceacdf360eb13d03 (patch) | |
| tree | 409439a733c0b69c7e432f6a1234e46a14c820e4 /source | |
| parent | 657806691b99f1e6f0f297f273e5ff9c1085564c (diff) | |
Fix T60417: Hair not instantly updating when editing curve guide
Reviewers: sergey, brecht
Maniphest Tasks: T60417
Differential Revision: https://developer.blender.org/D4193
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 3 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_physics.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 838905ac977..a34b7eeb913 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -394,7 +394,8 @@ void DepsgraphRelationBuilder::add_particle_forcefield_relations( ComponentKey eff_key(&relation->ob->id, DEG_NODE_TYPE_TRANSFORM); add_relation(eff_key, key, name); - if (ELEM(relation->pd->shape, PFIELD_SHAPE_SURFACE, PFIELD_SHAPE_POINTS)) { + if (ELEM(relation->pd->shape, PFIELD_SHAPE_SURFACE, PFIELD_SHAPE_POINTS) || + relation->pd->forcefield == PFIELD_GUIDE) { ComponentKey mod_key(&relation->ob->id, DEG_NODE_TYPE_GEOMETRY); add_relation(mod_key, key, name); } diff --git a/source/blender/depsgraph/intern/depsgraph_physics.cc b/source/blender/depsgraph/intern/depsgraph_physics.cc index 8d1b923f834..e091f612a05 100644 --- a/source/blender/depsgraph/intern/depsgraph_physics.cc +++ b/source/blender/depsgraph/intern/depsgraph_physics.cc @@ -155,7 +155,8 @@ void DEG_add_forcefield_relations(DepsNodeHandle *handle, handle, relation->ob, DEG_OB_COMP_TRANSFORM, name); if (relation->psys || - ELEM(relation->pd->shape, PFIELD_SHAPE_SURFACE, PFIELD_SHAPE_POINTS)) + ELEM(relation->pd->shape, PFIELD_SHAPE_SURFACE, PFIELD_SHAPE_POINTS) || + relation->pd->forcefield == PFIELD_GUIDE) { /* TODO(sergey): Consider going more granular with more dedicated * particle system operation. */ |