diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-07-27 13:50:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-27 14:47:41 +0300 |
| commit | c61e4f2683c0d7207948c06d028adfe67c67270c (patch) | |
| tree | 518ac4526651e0362b8d1d400d8712b0d47be687 /source/blender/editors/physics | |
| parent | 67fe5726af06740747c7d33e75d9f0d9324a2d17 (diff) | |
Don't allocate MFace's by default
This removes CD_MASK_MFACE from CD_MASK_BAREMESH, CD_MASK_DERIVEDMESH and others.
Callers that need it must explicitly add it to their data-masks.
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/particle_edit.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/physics/particle_object.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index e26d83ac648..892545a8efd 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -3485,7 +3485,7 @@ static int brush_add(PEData *data, short number) if (psmd->dm->deformedOnly || psys->part->use_modifier_stack) dm = psmd->dm; else { - dm = mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH); + dm = mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH | CD_MASK_MFACE); release_dm = true; } diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index dba6d6f5085..d3ab2bcb86b 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -696,7 +696,7 @@ static bool remap_hair_emitter(Scene *scene, Object *ob, ParticleSystem *psys, } else { /* warning: this rebuilds target_psmd->dm! */ - dm = mesh_get_derived_deform(scene, target_ob, CD_MASK_BAREMESH); + dm = mesh_get_derived_deform(scene, target_ob, CD_MASK_BAREMESH | CD_MASK_MFACE); } target_dm = target_psmd->dm; /* don't modify the original vertices */ |