[Bf-blender-cvs] [87625ccce9] cloth-improvements: Fix blenderplayer linking

[Luca Rood]

Commit: 87625ccce9afcd2e1b9a4b292f811270847a85b4
Author: Luca Rood
Date:   Sat Mar 18 19:35:41 2017 -0300
Branches: cloth-improvements
https://developer.blender.org/rB87625ccce9afcd2e1b9a4b292f811270847a85b4

Fix blenderplayer linking

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

M	source/blenderplayer/CMakeLists.txt
M	source/blenderplayer/bad_level_call_stubs/stubs.c

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

diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index 58bebc66a3..bc22fd0407 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -143,7 +143,6 @@ endif()
 		ge_logic_network 
 		ge_logic_ngnetwork 
 		ge_logic_loopbacknetwork 
-		extern_bullet 
 		bf_intern_guardedalloc 
 		bf_intern_memutil 
 		bf_python_ext
@@ -179,6 +178,7 @@ endif()
 		extern_glog
 		extern_gflags
 		extern_sdlew
+		extern_bullet
 	)
 
 	if(WITH_MOD_CLOTH_ELTOPO)
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 3b07d0acf5..bfa250ef28 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -526,6 +526,7 @@ void ED_object_constraint_tag_update(struct Object *ob, struct bConstraint *con)
 void ED_vgroup_vert_add(struct Object *ob, struct bDeformGroup *dg, int vertnum, float weight, int assignmode) RET_NONE
 void ED_vgroup_vert_remove(struct Object *ob, struct bDeformGroup *dg, int vertnum) RET_NONE
 float ED_vgroup_vert_weight(struct Object *ob, struct bDeformGroup *dg, int vertnum) RET_ZERO
+float ED_vgroup_combined_vert_weight(const struct Object *ob, const int vertnum, const int mode) RET_ZERO
 int ED_mesh_mirror_topo_table(struct Object *ob, struct DerivedMesh *dm, char mode) RET_ZERO
 int ED_mesh_mirror_spatial_table(struct Object *ob, struct BMEditMesh *em, struct DerivedMesh *dm, const float co[3], char mode) RET_ZERO