[Bf-blender-cvs] [ff471c95fce] soc-2018-npr: Compile Fix: Branch now compiles when WITH_OPENSUBDIV is disabled

[Joshua Leung]

Commit: ff471c95fce4abfa6047227b063617dc6ae3261b
Author: Joshua Leung
Date:   Tue Jul 31 00:54:51 2018 +1200
Branches: soc-2018-npr
https://developer.blender.org/rBff471c95fce4abfa6047227b063617dc6ae3261b

Compile Fix: Branch now compiles when WITH_OPENSUBDIV is disabled

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

M	source/blender/modifiers/intern/MOD_mybmesh.c

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

diff --git a/source/blender/modifiers/intern/MOD_mybmesh.c b/source/blender/modifiers/intern/MOD_mybmesh.c
index ba52be6b4b9..427d2b80f6a 100644
--- a/source/blender/modifiers/intern/MOD_mybmesh.c
+++ b/source/blender/modifiers/intern/MOD_mybmesh.c
@@ -65,6 +65,7 @@
 
 //TODO this modifier depends on OpenSubDiv. So if it's not compiled in, remove this modifier
 
+#ifdef WITH_OPENSUBDIV
 #include "opensubdiv_capi.h"
 #include "opensubdiv_converter_capi.h"
 #include "opensubdiv_evaluator_capi.h"
@@ -4324,6 +4325,8 @@ static Mesh *mybmesh_do(Mesh *mesh, MyBMeshModifierData *mmd, float cam_loc[3])
 	return result;
 }
 
+#endif /* WITH_OPENSUBDIV */
+
 /* MyBMesh */
 static void initData(ModifierData *md)
 {
@@ -4362,9 +4365,11 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx,
 		*/
 	}
 
+#ifdef WITH_OPENSUBDIV
 	if (!(result = mybmesh_do(mesh, mmd, cam_loc))) {
 		return mesh;
 	}
+#endif
 
 	return result;
 }