- added Mesh->derived and Mesh->decimated DerivedMesh pointers

 - removed DL_MESH displist type!!!! Now store a DerivedMesh directly.
 - May still be some issues left having to do with releasing this
   at the right time (old code just splashed free_displist all
   over the place).

1 files changed, 8 insertions, 3 deletions

diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index e8a6a82ff48..4fb8ae49052 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -46,6 +46,7 @@
  */
 
 struct Object;
+struct EditMesh;
 struct DispListMesh;
 
 typedef struct DerivedMesh DerivedMesh;
@@ -146,14 +147,18 @@ struct DerivedMesh {
 	void (*release)(DerivedMesh *dm);
 };
 
+	/* Internal function, just temporarily exposed */
+DerivedMesh *derivedmesh_from_displistmesh(struct EditMesh *em, struct DispListMesh *dlm);
+
 DerivedMesh *mesh_get_derived(struct Object *ob);
-DerivedMesh *mesh_get_derived_render(struct Object *ob);
 DerivedMesh *mesh_get_base_derived(struct Object *ob);
 
+DerivedMesh *mesh_get_derived_render(struct Object *ob, int *needsFree_r);
+
 	/* Utility function, just chooses appropriate DerivedMesh based
-	 * on mesh flags.
+	 * on mesh flags. Release result if *needsFree_r is true.
 	 */
-DerivedMesh *mesh_get_cage_derived(struct Object *ob);
+DerivedMesh *mesh_get_cage_derived(struct Object *ob, int *needsFree_r);
 
 #endif