Sculpt: Subsurf

* Now uses the CCG DerivedMesh also in object mode, used to be edit mode only.
* Create CD_ORIGINDEX layer on demand, to save memory.
* Removed ss_to_cdderivedmesh function, and instead create ccgdm and then
  convert that to cddm, to avoid code duplication.
* Added and implement DerivedMesh interface functions to obtain face grids.
* Store edge/face flags more memory efficient.
* Export CCGDerivedMesh struct in BKE_subsurf.h

1 files changed, 46 insertions, 7 deletions

diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h
index f6dc22f650a..7b8adb7cb8e 100644
--- a/source/blender/blenkernel/BKE_subsurf.h
+++ b/source/blender/blenkernel/BKE_subsurf.h
@@ -34,21 +34,60 @@ struct DerivedMesh;
 struct EditMesh;
 struct MultiresSubsurf;
 struct SubsurfModifierData;
+struct _CCGSubsurf;
+struct _CCGVert;
+struct _CCGEdge;
+struct _CCGFace;
+struct PBVH;
+struct DMGridData;
+struct DMGridAdjacency;
 
-struct DerivedMesh *subsurf_make_derived_from_derived(
-                        struct DerivedMesh *dm,
-                        struct SubsurfModifierData *smd,
-                        int useRenderParams, float (*vertCos)[3],
-                        int isFinalCalc, int editMode);
+/**************************** External *****************************/
 
-struct DerivedMesh *subsurf_make_derived_from_derived_with_multires(
+struct DerivedMesh *subsurf_make_derived_from_derived(
                         struct DerivedMesh *dm,
                         struct SubsurfModifierData *smd,
-			struct MultiresSubsurf *ms,
                         int useRenderParams, float (*vertCos)[3],
                         int isFinalCalc, int editMode);
 
 void subsurf_calculate_limit_positions(Mesh *me, float (*positions_r)[3]);
 
+/**************************** Internal *****************************/
+
+typedef struct CCGDerivedMesh {
+	DerivedMesh dm;
+
+	struct _CCGSubSurf *ss;
+	int freeSS;
+	int drawInteriorEdges, useSubsurfUv;
+
+	struct {int startVert; struct _CCGVert *vert;} *vertMap;
+	struct {int startVert; int startEdge; struct _CCGEdge *edge;} *edgeMap;
+	struct {int startVert; int startEdge;
+	        int startFace; struct _CCGFace *face;} *faceMap;
+
+	short *edgeFlags;
+	char *faceFlags;
+
+	struct PBVH *pbvh;
+
+	struct DMGridData **gridData;
+	struct DMGridAdjacency *gridAdjacency;
+	struct _CCGFace **gridFaces;
+
+	struct {
+		struct MultiresModifierData *mmd;
+		int local_mmd;
+
+		int lvl, totlvl;
+		float (*orco)[3];
+
+		Object *ob;
+		int modified;
+
+		void (*update)(DerivedMesh*);
+	} multires;
+} CCGDerivedMesh;
+
 #endif