Commit: 301bb5afa5b5cf8d0ef85d21dc729a478e60753b
Author: Sergey Sharybin
Date: Fri Jan 14 17:05:58 2022 +0100
Branches: master
https://developer.blender.org/rB301bb5afa5b5cf8d0ef85d21dc729a478e60753b
Cleanup: Remove unused functions
===================================================================
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/intern/DerivedMesh.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h
b/source/blender/blenkernel/BKE_DerivedMesh.h
index c5171371afc..269d90b868e 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -390,12 +390,6 @@ struct Mesh *editbmesh_get_eval_cage_from_orig(struct
Depsgraph *depsgraph,
struct Scene *scene,
struct Object *obedit,
const struct
CustomData_MeshMasks *dataMask);
-struct Mesh *editbmesh_get_eval_cage_and_final(struct Depsgraph *depsgraph,
- struct Scene *scene,
- struct Object *,
- struct BMEditMesh *em,
- const struct
CustomData_MeshMasks *dataMask,
- struct Mesh **r_final);
float (*editbmesh_vert_coords_alloc(struct BMEditMesh *em, int
*r_vert_len))[3];
bool editbmesh_modifier_is_enabled(struct Scene *scene,
diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc
b/source/blender/blenkernel/intern/DerivedMesh.cc
index f25c0044c7d..8a73995b86a 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.cc
+++ b/source/blender/blenkernel/intern/DerivedMesh.cc
@@ -2054,33 +2054,6 @@ Mesh *mesh_create_eval_no_deform_render(Depsgraph
*depsgraph,
/***/
-Mesh *editbmesh_get_eval_cage_and_final(Depsgraph *depsgraph,
- Scene *scene,
- Object *obedit,
- BMEditMesh *em,
- const CustomData_MeshMasks *dataMask,
- /* return args */
- Mesh **r_final)
-{
- CustomData_MeshMasks cddata_masks = *dataMask;
-
- /* if there's no derived mesh or the last data mask used doesn't include
- * the data we need, rebuild the derived mesh
- */
- object_get_datamask(depsgraph, obedit, &cddata_masks, nullptr);
-
- if (!em->mesh_eval_cage ||
- !CustomData_MeshMasks_are_matching(&(em->lastDataMask), &cddata_masks)) {
- editbmesh_build_data(depsgraph, scene, obedit, em, &cddata_masks);
- }
-
- *r_final = em->mesh_eval_final;
- if (em->mesh_eval_final) {
- BLI_assert(!(em->mesh_eval_final->runtime.cd_dirty_vert &
DM_DIRTY_NORMALS));
- }
- return em->mesh_eval_cage;
-}
-
Mesh *editbmesh_get_eval_cage(struct Depsgraph *depsgraph,
Scene *scene,
Object *obedit,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
