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

2 files changed, 7 insertions, 5 deletions

diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c
index 5d94fb32438..cda15c606ed 100644
--- a/source/blender/editors/mesh/editface.c
+++ b/source/blender/editors/mesh/editface.c
@@ -99,15 +99,17 @@ void object_facesel_flush_dm(Object *ob)
 	int totface;
 	int i;
 	
-	
-	if(me==NULL || dm==NULL || !CustomData_has_layer( &dm->faceData, CD_ORIGINDEX))
+	if(me==NULL || dm==NULL)
+		return;
+
+	index_array = dm->getFaceDataArray(dm, CD_ORIGINDEX);
+
+	if(!index_array)
 		return;
 	
 	faces = dm->getFaceArray(dm);
 	totface = dm->getNumFaces(dm);
 	
-	index_array = dm->getFaceDataArray(dm, CD_ORIGINDEX);
-	
 	mf= faces;
 	
 	for (i= 0; i<totface; i++, mf++) { /* loop over derived mesh faces */
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 1f230b5cd65..873bbc2baa6 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -1368,7 +1368,7 @@ void sculpt_update_mesh_elements(bContext *C, int need_fmap)
 	}
 
 	ss->ob = ob;
-	ss->tree = dm->getPBVH(dm);
+	ss->tree = dm->getPBVH(ob, dm);
 	ss->fmap = (need_fmap)? dm->getFaceMap(dm): NULL;
 }