diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 16:20:18 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 16:20:18 +0300 |
| commit | 53a56b7b6c169b21df475ae94795208501581489 (patch) | |
| tree | 011410b7ff5488b5b9d57029ed576929e770bceb /source/blender/modifiers/intern/MOD_particlesystem.c | |
| parent | d89f9d70c52001e09ee3ab80a3547ba140e00aec (diff) | |
| parent | 3740f7593d7146135c2d2fac363f8aed4ba41cf0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_particlesystem.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_particlesystem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index 9ab3f9ae937..a2add591938 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.c +++ b/source/blender/modifiers/intern/MOD_particlesystem.c @@ -70,16 +70,18 @@ static void freeData(ModifierData *md) psmd->dm_deformed = NULL; } } + psmd->totdmvert = psmd->totdmedge = psmd->totdmface = 0; /* ED_object_modifier_remove may have freed this first before calling * modifier_free (which calls this function) */ if (psmd->psys) psmd->psys->flag |= PSYS_DELETE; } -static void copyData(ModifierData *md, ModifierData *target) + +static void copyData(const ModifierData *md, ModifierData *target) { #if 0 - ParticleSystemModifierData *psmd = (ParticleSystemModifierData *) md; + const ParticleSystemModifierData *psmd = (const ParticleSystemModifierData *) md; #endif ParticleSystemModifierData *tpsmd = (ParticleSystemModifierData *) target; |