[Bf-blender-cvs] [2336410] opensubdiv-modifier: OpenSubdiv: Some more compilation error fixes

[Sergey Sharybin]

Commit: 233641064bd1a9d132f6ea94ce81ffbbc5c10e4e
Author: Sergey Sharybin
Date:   Mon Jul 20 12:01:00 2015 +0200
Branches: opensubdiv-modifier
https://developer.blender.org/rB233641064bd1a9d132f6ea94ce81ffbbc5c10e4e

OpenSubdiv: Some more compilation error fixes

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

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

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

diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 0584549..50e8ef2 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -4452,6 +4452,7 @@ static bool subsurf_use_gpu_backend(SubsurfFlags flags)
 	        (U.opensubdiv_compute_type != USER_OPENSUBDIV_COMPUTE_NONE) &&
 	        (openSubdiv_supportGPUDisplay());
 #else
+	(void)flags;
 	return false;
 #endif
 }
@@ -4482,7 +4483,9 @@ struct DerivedMesh *subsurf_make_derived_from_derived(
 
 		smd->emCache = _getSubSurf(smd->emCache, levels, 3, useSimple | useAging | CCG_CALC_NORMALS);
 
+#ifdef WITH_OPENSUBDIV
 		ccgSubSurf_setSkipGrids(smd->emCache, use_gpu_backend);
+#endif
 		ss_sync_from_derivedmesh(smd->emCache, dm, vertCos, useSimple);
 		result = getCCGDerivedMesh(smd->emCache,
 		                           drawInteriorEdges,
@@ -4562,7 +4565,9 @@ struct DerivedMesh *subsurf_make_derived_from_derived(
 				ccg_flags |= CCG_ALLOC_MASK;
 
 			ss = _getSubSurf(prevSS, levels, 3, ccg_flags);
+#ifdef WITH_OPENSUBDIV
 			ccgSubSurf_setSkipGrids(ss, use_gpu_backend);
+#endif
 			ss_sync_from_derivedmesh(ss, dm, vertCos, useSimple);
 
 			result = getCCGDerivedMesh(ss, drawInteriorEdges, useSubsurfUv, dm, use_gpu_backend);