diff options
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_DerivedMesh.h | 12 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_mesh_runtime.h | 30 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/data_transfer.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_convert.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_runtime.c | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/multires.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/paint.c | 1 |
9 files changed, 44 insertions, 12 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index e918f158682..79b0e5eb95f 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -531,18 +531,6 @@ DMCoNo *mesh_get_mapped_verts_nors(struct Scene *scene, struct Object *ob); void mesh_get_mapped_verts_coords(DerivedMesh *dm, float (*r_cos)[3], const int totcos); /* */ -DerivedMesh *mesh_get_derived_final( - struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, CustomDataMask dataMask); -struct Mesh *mesh_get_eval_final( - struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, CustomDataMask dataMask); - -DerivedMesh *mesh_get_derived_deform( - struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, CustomDataMask dataMask); -struct Mesh *mesh_get_eval_deform( - struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, CustomDataMask dataMask); DerivedMesh *mesh_create_derived_for_modifier( struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, diff --git a/source/blender/blenkernel/BKE_mesh_runtime.h b/source/blender/blenkernel/BKE_mesh_runtime.h index beca4f9db5a..da11eb81267 100644 --- a/source/blender/blenkernel/BKE_mesh_runtime.h +++ b/source/blender/blenkernel/BKE_mesh_runtime.h @@ -33,10 +33,22 @@ * This file contains access functions for the Mesh.runtime struct. */ +#include "BKE_customdata.h" /* for CustomDataMask */ + +struct Depsgraph; struct Mesh; struct MLoop; struct MLoopTri; struct MVertTri; +struct Object; +struct Scene; + +/* Undefine to hide DerivedMesh-based function declarations */ +#define WITH_DERIVEDMESH + +#ifdef WITH_DERIVEDMESH +struct DerivedMesh; +#endif void BKE_mesh_runtime_reset(struct Mesh *mesh); int BKE_mesh_runtime_looptri_len(const struct Mesh *mesh); @@ -51,5 +63,23 @@ void BKE_mesh_runtime_verttri_from_looptri( struct MVertTri *r_verttri, const struct MLoop *mloop, const struct MLoopTri *looptri, int looptri_num); +/* NOTE: the functions below are defined in DerivedMesh.c, and are intended to be moved + * to a more suitable location when that file is removed. */ +#ifdef WITH_DERIVEDMESH +struct DerivedMesh *mesh_get_derived_final( + struct Depsgraph *depsgraph, struct Scene *scene, + struct Object *ob, CustomDataMask dataMask); +#endif +struct Mesh *mesh_get_eval_final( + struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, CustomDataMask dataMask); + +#ifdef WITH_DERIVEDMESH +struct DerivedMesh *mesh_get_derived_deform( + struct Depsgraph *depsgraph, struct Scene *scene, + struct Object *ob, CustomDataMask dataMask); +#endif +struct Mesh *mesh_get_eval_deform( + struct Depsgraph *depsgraph, struct Scene *scene, + struct Object *ob, CustomDataMask dataMask); #endif /* __BKE_MESH_RUNTIME_H__ */ diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 1c12b73dff9..e7e434042dd 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -3105,6 +3105,7 @@ void makeDerivedMesh( /***/ +#ifdef WITH_DERIVEDMESH /* Deprecated DM, use: 'mesh_get_eval_final'. */ DerivedMesh *mesh_get_derived_final( struct Depsgraph *depsgraph, Scene *scene, Object *ob, CustomDataMask dataMask) @@ -3125,6 +3126,7 @@ DerivedMesh *mesh_get_derived_final( if (ob->derivedFinal) { BLI_assert(!(ob->derivedFinal->dirty & DM_DIRTY_NORMALS)); } return ob->derivedFinal; } +#endif Mesh *mesh_get_eval_final( struct Depsgraph *depsgraph, Scene *scene, Object *ob, CustomDataMask dataMask) { @@ -3145,6 +3147,7 @@ Mesh *mesh_get_eval_final( return ob->runtime.mesh_eval; } +#ifdef WITH_DERIVEDMESH /* Deprecated DM, use: 'mesh_get_eval_deform' instead. */ DerivedMesh *mesh_get_derived_deform(struct Depsgraph *depsgraph, Scene *scene, Object *ob, CustomDataMask dataMask) { @@ -3164,6 +3167,7 @@ DerivedMesh *mesh_get_derived_deform(struct Depsgraph *depsgraph, Scene *scene, return ob->derivedDeform; } +#endif Mesh *mesh_get_eval_deform(struct Depsgraph *depsgraph, Scene *scene, Object *ob, CustomDataMask dataMask) { /* if there's no derived mesh or the last data mask used doesn't include diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index 0451031c5b8..3639649eab5 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -50,6 +50,7 @@ #include "BKE_DerivedMesh.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" +#include "BKE_mesh_runtime.h" #include "BKE_mesh_remap.h" #include "BKE_object.h" #include "BKE_object_deform.h" diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index a3eef7b17b2..9773a487b46 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -43,6 +43,7 @@ #include "BKE_global.h" #include "BKE_key.h" #include "BKE_mesh.h" +#include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "BKE_displist.h" #include "BKE_library.h" diff --git a/source/blender/blenkernel/intern/mesh_runtime.c b/source/blender/blenkernel/intern/mesh_runtime.c index 86d3cf7a0c8..2109a465c55 100644 --- a/source/blender/blenkernel/intern/mesh_runtime.c +++ b/source/blender/blenkernel/intern/mesh_runtime.c @@ -35,6 +35,7 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "BLI_math_geom.h" #include "BLI_threads.h" @@ -43,6 +44,10 @@ #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" +#ifdef WITH_DERIVEDMESH +#include "BKE_DerivedMesh.h" +#endif + /* -------------------------------------------------------------------- */ /** \name Mesh Runtime Struct Utils * \{ */ diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index ee32c2398b2..39a472241bc 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -51,6 +51,7 @@ #include "BKE_cdderivedmesh.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" +#include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "BKE_multires.h" #include "BKE_paint.h" diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index 2c94dc76854..01b26600403 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -56,6 +56,7 @@ #include "BKE_lattice.h" #include "BKE_main.h" #include "BKE_mesh.h" +#include "BKE_mesh_runtime.h" #include "BKE_object.h" #include "BKE_particle.h" #include "BKE_scene.h" diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index f961510984a..8dad89218be 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -59,6 +59,7 @@ #include "BKE_key.h" #include "BKE_library.h" #include "BKE_mesh.h" +#include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_paint.h" |