archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: move DerivedMesh wrappers for modifiers further down the hierarchy

Browse Source 
The main goal of this patch is to cleanup the interface of every modifier. More specifically the interface of modifiers should be DerivedMesh-free.
Internally some modifiers still use DerivedMesh. However I think it is better when the wrappers are in the modifiers so that higher level functions can use the simplified interface.

This patch removes the applyModifier_DM and applyModifierEM_DM functions. In a previous patch (rB3614d9d) the other functions that used DerivedMesh have been removed.

Reviewers: brecht
This commit is contained in:
Jacques Lucke
2018-09-20 12:04:17 +02:00
parent add8e1c018
commit b5dbe43d3e
11 changed files with 98 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/DerivedMesh.c
View File

@@ -2655,7 +2655,7 @@ static void editbmesh_calc_modifiers(
mask &= ~CD_MASK_ORCO;
DM_set_only_copy(orcodm, mask | CD_MASK_ORIGINDEX);
if (mti->applyModifierEM || mti->applyModifierEM_DM) {
if (mti->applyModifierEM) {
ndm = modwrap_applyModifierEM(md, &mectx_orco, em, orcodm);
}
else {
@@ -2683,7 +2683,7 @@ static void editbmesh_calc_modifiers(
}
}
if (mti->applyModifierEM || mti->applyModifierEM_DM)
if (mti->applyModifierEM)
ndm = modwrap_applyModifierEM(md, &mectx_cache, em, dm);
else
ndm = modwrap_applyModifier(md, &mectx_cache, dm);