diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2019-06-14 21:41:09 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2019-06-14 21:41:09 +0300 |
| commit | 314eef0df8a46590e921e463576f851c6bc903bd (patch) | |
| tree | 753ee5e2bd41a9c9639050e9c992176be93067ae /source/blender/blenloader/intern/readfile.c | |
| parent | 34fa0f8ac69afb1770a0561092fc3ae9f6cec793 (diff) | |
| parent | 0707177ab868f1845dba1ecfd396e58c091e89b0 (diff) | |
Merge branch 'master' into soc-2019-openxr
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 06f951b4a07..d47ecff095c 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5663,8 +5663,6 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb) else if (md->type == eModifierType_ParticleSystem) { ParticleSystemModifierData *psmd = (ParticleSystemModifierData *)md; - psmd->mesh_final = NULL; - psmd->mesh_original = NULL; psmd->psys = newdataadr(fd, psmd->psys); psmd->flag &= ~eParticleSystemFlag_psys_updated; psmd->flag |= eParticleSystemFlag_file_loaded; |