diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-25 22:44:33 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-26 00:20:20 +0300 |
commit | c9f7a3b32a39aec2c7826f2ffa9939fd705e7237 (patch) | |
tree | 009def8c360ace12f15143bddad06f7ebef4ea16 /source/blender/blenloader | |
parent | 768706c6a58fe6b93f3534ca65d1912cbf066e68 (diff) |
Fix T55207, fix T55208: hair not positioned correctly after subsurf.
The problem was that the particle system modifier was reading ob->derivedDeform
during modifier stack evaluation. Due to the mesh -> DM conversion this was no
longer set leading to wrong results.
In fact we don't really need the deformed mesh, just the original mesh topology
for face/poly index remapping. So the solution is to use that instead.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index e74f82dfb6d..bc4b8daf0d3 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5230,7 +5230,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb) ParticleSystemModifierData *psmd = (ParticleSystemModifierData *)md; psmd->mesh_final = NULL; - psmd->mesh_deformed = NULL; + psmd->mesh_original = NULL; psmd->psys= newdataadr(fd, psmd->psys); psmd->flag &= ~eParticleSystemFlag_psys_updated; psmd->flag |= eParticleSystemFlag_file_loaded; |