diff options
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_DerivedMesh.h | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_mesh_runtime.h | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 19 |
3 files changed, 26 insertions, 11 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index baec7e77328..e209938cc80 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -504,14 +504,6 @@ DerivedMesh *mesh_create_derived_render( /* same as above but wont use render settings */ DerivedMesh *mesh_create_derived(struct Mesh *me, float (*vertCos)[3]); -DerivedMesh *mesh_create_derived_no_deform( - struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, float (*vertCos)[3], - CustomDataMask dataMask); -DerivedMesh *mesh_create_derived_no_deform_render( - struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, float (*vertCos)[3], - CustomDataMask dataMask); struct Mesh *editbmesh_get_eval_cage( struct Depsgraph *depsgraph, struct Scene *scene, struct Object *, diff --git a/source/blender/blenkernel/BKE_mesh_runtime.h b/source/blender/blenkernel/BKE_mesh_runtime.h index 5d35f798ad7..8f9de85a302 100644 --- a/source/blender/blenkernel/BKE_mesh_runtime.h +++ b/source/blender/blenkernel/BKE_mesh_runtime.h @@ -109,6 +109,16 @@ struct Mesh *mesh_create_eval_final_view( struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, CustomDataMask dataMask); +struct Mesh *mesh_create_eval_no_deform( + struct Depsgraph *depsgraph, struct Scene *scene, + struct Object *ob, float (*vertCos)[3], + CustomDataMask dataMask); +struct Mesh *mesh_create_eval_no_deform_render( + struct Depsgraph *depsgraph, struct Scene *scene, + struct Object *ob, float (*vertCos)[3], + CustomDataMask dataMask); + + void BKE_mesh_runtime_eval_to_meshkey(struct Mesh *me_deformed, struct Mesh *me, struct KeyBlock *kb); diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index abad99a4909..aa1966b0053 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -2348,13 +2348,26 @@ Mesh *mesh_create_eval_final_view( return final; } -DerivedMesh *mesh_create_derived_no_deform( +Mesh *mesh_create_eval_no_deform( struct Depsgraph *depsgraph, Scene *scene, Object *ob, float (*vertCos)[3], CustomDataMask dataMask) { - DerivedMesh *final; + Mesh *final; - mesh_calc_modifiers_dm( + mesh_calc_modifiers( + depsgraph, scene, ob, vertCos, 0, false, dataMask, -1, false, false, + NULL, &final); + + return final; +} + +Mesh *mesh_create_eval_no_deform_render( + struct Depsgraph *depsgraph, Scene *scene, Object *ob, + float (*vertCos)[3], CustomDataMask dataMask) +{ + Mesh *final; + + mesh_calc_modifiers( depsgraph, scene, ob, vertCos, 0, false, dataMask, -1, false, false, NULL, &final); |