diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-15 08:06:42 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-15 08:06:42 +0300 |
| commit | 2deeca4fb00363d1d9098b7d6983bf5ed8767fa7 (patch) | |
| tree | d557b1213e34a5c249c427a34f10fc6cbfa41fe7 /source | |
| parent | 0ef4c4e12a95cbe49af6e42b6e20a6d69547796c (diff) | |
Cleanup: remove references to DerivedMesh
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/BKE_DerivedMesh.h | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/editmesh.c | 13 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_runtime.c | 1 |
3 files changed, 5 insertions, 10 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index db918bb0fbd..69dda178c67 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -122,7 +122,6 @@ typedef struct DMFlagMat { typedef enum DerivedMeshType { DM_TYPE_CDDM, - DM_TYPE_EDITBMESH, DM_TYPE_CCGDM } DerivedMeshType; diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c index 0d09f4be39f..7e3693987f7 100644 --- a/source/blender/blenkernel/intern/editmesh.c +++ b/source/blender/blenkernel/intern/editmesh.c @@ -155,15 +155,12 @@ void BKE_editmesh_tessface_calc(BMEditMesh *em) /* commented because editbmesh_build_data() ensures we get tessfaces */ #if 0 - if (em->derivedFinal && em->derivedFinal == em->derivedCage) { - if (em->derivedFinal->recalcTessellation) - em->derivedFinal->recalcTessellation(em->derivedFinal); + if (em->mesh_eval_final && em->mesh_eval_final == em->mesh_eval_cage) { + BKE_mesh_runtime_looptri_ensure(em->mesh_eval_final); } - else if (em->derivedFinal) { - if (em->derivedCage->recalcTessellation) - em->derivedCage->recalcTessellation(em->derivedCage); - if (em->derivedFinal->recalcTessellation) - em->derivedFinal->recalcTessellation(em->derivedFinal); + else if (em->mesh_eval_final) { + BKE_mesh_runtime_looptri_ensure(em->mesh_eval_final); + BKE_mesh_runtime_looptri_ensure(em->mesh_eval_cage); } #endif } diff --git a/source/blender/blenkernel/intern/mesh_runtime.c b/source/blender/blenkernel/intern/mesh_runtime.c index f74be727362..68880cacfb9 100644 --- a/source/blender/blenkernel/intern/mesh_runtime.c +++ b/source/blender/blenkernel/intern/mesh_runtime.c @@ -271,7 +271,6 @@ char *BKE_mesh_runtime_debug_info(Mesh *me_eval) const char *tstr; switch (me_eval->type) { case DM_TYPE_CDDM: tstr = "DM_TYPE_CDDM"; break; - case DM_TYPE_EDITBMESH: tstr = "DM_TYPE_EDITMESH"; break; case DM_TYPE_CCGDM: tstr = "DM_TYPE_CCGDM"; break; default: tstr = "UNKNOWN"; break; } |