griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: remove references to DerivedMesh

Browse Source
This commit is contained in:
Campbell Barton
2018-10-15 16:06:42 +11:00
parent 0ef4c4e12a
commit 2deeca4fb0
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_DerivedMesh.h
View File

@@ -122,7 +122,6 @@ typedef struct DMFlagMat {
typedef enum DerivedMeshType {
DM_TYPE_CDDM,
DM_TYPE_EDITBMESH,
DM_TYPE_CCGDM
} DerivedMeshType;

13
source/blender/blenkernel/intern/editmesh.c
View File

@@ -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
}

1
source/blender/blenkernel/intern/mesh_runtime.c
View File

@@ -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;
}