diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-08-02 14:55:36 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-08-02 14:55:36 +0300 |
| commit | b908fa3fdab51f350885d82d73082df6cc56bec7 (patch) | |
| tree | 4594254fa4146847011a76161cdc5707bd41de02 /source/blender/physics/intern/strands.cpp | |
| parent | 683caa32dbd9715b1fbefb11533008e5d3f11c49 (diff) | |
Always cache the original strand vertex locations during editing.
True constraint resolving for length and contacts will need this information.
Diffstat (limited to 'source/blender/physics/intern/strands.cpp')
| -rw-r--r-- | source/blender/physics/intern/strands.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/physics/intern/strands.cpp b/source/blender/physics/intern/strands.cpp index 44a92dc8a94..cafe444bb99 100644 --- a/source/blender/physics/intern/strands.cpp +++ b/source/blender/physics/intern/strands.cpp @@ -415,6 +415,7 @@ static void strands_solve_inverse_kinematics(Object *ob, BMEditStrands *edit, fl void BPH_strands_solve_constraints(Scene *scene, Object *ob, BMEditStrands *edit, float (*orig)[3]) { HairEditSettings *settings = &scene->toolsettings->hair_edit; + BLI_assert(orig); strands_apply_root_locations(edit); @@ -422,8 +423,7 @@ void BPH_strands_solve_constraints(Scene *scene, Object *ob, BMEditStrands *edit strands_solve_edge_relaxation(edit); } else { - if (orig) - strands_solve_inverse_kinematics(ob, edit, orig); + strands_solve_inverse_kinematics(ob, edit, orig); } |