- removed USE_CCGSUBSURF define (always on now)

 - added G.editMesh->derived pointer... idea is to use this
   for mesh derived from editmesh instead of Mesh->derived (as the
   derived mesh tends to vary depending on what it came from).

   This part could be cleaner, also there may problems with it not
   being invalidated correctly.

 - And most importantly: In case people were beginning to worry all
   these edits were just crazy zr stuff, the big point comes about:
   Incremental subsurf calculation is now enabled. This gives massive
   speed improvements when editing a large mesh.

   For the eye-candy happy: try setting G.rt==52 before entering editmode
   and the edges and vertices (in optimal mode) will switch to displaying
   visually the age since a region has last been calculated. Lots of
   fun!

1 files changed, 9 insertions, 6 deletions

diff --git a/source/blender/blenkernel/intern/subsurf.c b/source/blender/blenkernel/intern/subsurf.c
index a2c2a9a637d..44c9f3a13bb 100644
--- a/source/blender/blenkernel/intern/subsurf.c
+++ b/source/blender/blenkernel/intern/subsurf.c
@@ -1089,16 +1089,21 @@ static DispListMesh *subsurf_subdivide_to_displistmesh(HyperMesh *hme, short sub
 	return dlm;
 }
 
-DerivedMesh *subsurf_make_derived_from_editmesh(EditMesh *em, int subdivLevels, short type) {
+DerivedMesh *subsurf_make_derived_from_editmesh(EditMesh *em, int subdivLevels, short type, DerivedMesh *oldDerived) {
 	if (subdivLevels<1) {
+		if (oldDerived) {
+			oldDerived->release(oldDerived);
+		}
 		return derivedmesh_from_displistmesh(em, displistmesh_from_editmesh(em));
-#ifdef USE_CCGSUBSURFLIB
 	} else if (type==ME_CCG_SUBSURF) {
-		return subsurf_ccg_make_derived_from_editmesh(em, subdivLevels);
-#endif
+		return subsurf_ccg_make_derived_from_editmesh(em, subdivLevels, oldDerived);
 	} else {
 		HyperMesh *hme= hypermesh_from_editmesh(em, subdivLevels);
 	
+		if (oldDerived) {
+			oldDerived->release(oldDerived);
+		}
+
 		return derivedmesh_from_displistmesh(em, subsurf_subdivide_to_displistmesh(hme, subdivLevels, type));
 	}
 }
@@ -1106,10 +1111,8 @@ DerivedMesh *subsurf_make_derived_from_editmesh(EditMesh *em, int subdivLevels,
 DerivedMesh *subsurf_make_derived_from_mesh(Mesh *me, int subdivLevels) {
 	if (subdivLevels<1) {
 		return derivedmesh_from_displistmesh(NULL, displistmesh_from_mesh(me, NULL));
-#ifdef USE_CCGSUBSURFLIB
 	} else if (me->subsurftype==ME_CCG_SUBSURF) {
 		return subsurf_ccg_make_derived_from_mesh(me, subdivLevels);
-#endif
 	} else {
 		HyperMesh *hme= hypermesh_from_mesh(me, subdivLevels);