[Bf-blender-cvs] [7aa1c544f73] soc-2018-npr: Fix opensubdiv error when not enabled WITH_OPENSUBDIV

Nick Wu noreply at git.blender.org
Tue Aug 14 10:21:07 CEST 2018


Commit: 7aa1c544f73e430ee50849cabd31a59b5acbf4de
Author: Nick Wu
Date:   Tue Aug 14 16:20:19 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB7aa1c544f73e430ee50849cabd31a59b5acbf4de

Fix opensubdiv error when not enabled WITH_OPENSUBDIV

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

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 8664de40206..f7fa77be8d1 100644
--- a/source/blender/modifiers/intern/MOD_mybmesh.c
+++ b/source/blender/modifiers/intern/MOD_mybmesh.c
@@ -4148,8 +4148,6 @@ static Mesh *mybmesh_do(Mesh *mesh, MyBMeshModifierData *mmd, float cam_loc[3])
 	return result;
 }
 
-#endif /* WITH_OPENSUBDIV */
-
 /* MyBMesh */
 static void initData(ModifierData *md)
 {
@@ -4167,6 +4165,8 @@ static void freeData(ModifierData *md)
 	}
 }
 
+#endif /* WITH_OPENSUBDIV */
+
 static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx,
 								Mesh *mesh)
 {



More information about the Bf-blender-cvs mailing list