[Bf-blender-cvs] [80c50a1] master: OpenSubdiv: Make subsurf behavior closer to original one when built with OpenSubdiv but without enabling option

[Sergey Sharybin]

Commit: 80c50a1d4903a5c31765a85e270660afbce21263
Author: Sergey Sharybin
Date:   Wed Aug 5 11:54:11 2015 +0200
Branches: master
https://developer.blender.org/rB80c50a1d4903a5c31765a85e270660afbce21263

OpenSubdiv: Make subsurf behavior closer to original one when built with OpenSubdiv but without enabling option

===================================================================

M	source/blender/blenkernel/intern/subsurf_ccg.c
M	source/blender/modifiers/intern/MOD_subsurf.c

===================================================================

diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index f6337d6..a3e4b47 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -4758,11 +4758,15 @@ struct DerivedMesh *subsurf_make_derived_from_derived(
 				 * this is to be investiated still to be sure we don't have
 				 * regressions here.
 				 */
-				prevSS = smd->mCache;
-#else
-				ccgSubSurf_free(smd->mCache);
-				smd->mCache = NULL;
+				if (use_gpu_backend) {
+					prevSS = smd->mCache;
+				}
+				else
 #endif
+				{
+					ccgSubSurf_free(smd->mCache);
+					smd->mCache = NULL;
+				}
 			}
 
 
diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c
index dc6e3b4..edf02ab 100644
--- a/source/blender/modifiers/intern/MOD_subsurf.c
+++ b/source/blender/modifiers/intern/MOD_subsurf.c
@@ -104,7 +104,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 
 #ifdef WITH_OPENSUBDIV
 	const bool allow_gpu = (flag & MOD_APPLY_ALLOW_GPU) != 0;
-	const bool do_cddm_convert = useRenderParams;
+	const bool do_cddm_convert = useRenderParams || (!isFinalCalc && !smd->use_opensubdiv);
 #else
 	const bool do_cddm_convert = useRenderParams || !isFinalCalc;
 #endif