[Bf-blender-cvs] [a3bb1dc] master: Fix the skin modifier crashing when building without Bullet.

[Brecht Van Lommel]

Commit: a3bb1dca25d37a41463799ad55c31840637d1774
Author: Brecht Van Lommel
Date:   Wed Sep 24 22:05:41 2014 +0200
Branches: master
https://developer.blender.org/rBa3bb1dca25d37a41463799ad55c31840637d1774

Fix the skin modifier crashing when building without Bullet.

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

M	source/blender/modifiers/CMakeLists.txt
M	source/blender/modifiers/SConscript
M	source/blender/modifiers/intern/MOD_skin.c

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

diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index b841356..71c84fd 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -133,6 +133,10 @@ if(WITH_MOD_OCEANSIM)
 	add_definitions(-DWITH_OCEANSIM)
 endif()
 
+if(WITH_BULLET)
+	add_definitions(-DWITH_BULLET)
+endif()
+
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript
index 0942bca..c112f52 100644
--- a/source/blender/modifiers/SConscript
+++ b/source/blender/modifiers/SConscript
@@ -64,6 +64,9 @@ if env['WITH_BF_FLUID']:
 if env['WITH_BF_OCEANSIM']:
     defs.append('WITH_OCEANSIM')
 
+if env['WITH_BF_BULLET']:
+    defs.append('WITH_BULLET')
+
 if env['WITH_BF_GAMEENGINE']:
     incs.append('#/extern/recastnavigation')
     defs.append('WITH_GAMEENGINE')
diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c
index 825015f..dd56881 100644
--- a/source/blender/modifiers/intern/MOD_skin.c
+++ b/source/blender/modifiers/intern/MOD_skin.c
@@ -218,6 +218,7 @@ static bool skin_frame_find_contained_faces(const Frame *frame,
 /* Returns true if hull is successfully built, false otherwise */
 static bool build_hull(SkinOutput *so, Frame **frames, int totframe)
 {
+#ifdef WITH_BULLET
 	BMesh *bm = so->bm;
 	BMOperator op;
 	BMIter iter;
@@ -326,6 +327,9 @@ static bool build_hull(SkinOutput *so, Frame **frames, int totframe)
 	BM_mesh_delete_hflag_tagged(bm, BM_ELEM_TAG, BM_EDGE | BM_FACE);
 
 	return true;
+#else
+	return false;
+#endif
 }
 
 /* Returns the average frame side length (frames are rectangular, so