Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-11-05 04:47:55 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-11-05 04:47:55 +0300
commitda402c937ea3e86159ab22c3efd4f235c5533c08 (patch)
tree37f54b34d96b6a95111648001e60a5b693be02bc /source/blenderplayer
parent52865a51408fba9c871caff82ca0acb71a37d2d7 (diff)
fix for linking the player, also fixes building without python and bullet.
Diffstat (limited to 'source/blenderplayer')
-rw-r--r--source/blenderplayer/CMakeLists.txt2
-rw-r--r--source/blenderplayer/bad_level_call_stubs/stubs.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index b1dbde8d4b1..6c97c2a4465 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -74,8 +74,8 @@ IF(UNIX)
bf_converter
bf_ketsji
bf_bullet
+ bf_dummy
bf_common
- bf_dummy
bf_logic
bf_rasterizer
bf_oglrasterizer
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 7bef93cc4d8..7f0a57be371 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -358,6 +358,7 @@ struct wmOperatorTypeMacro *WM_operatortype_macro_define(struct wmOperatorType *
int WM_operator_call_py(struct bContext *C, struct wmOperatorType *ot, int context, struct PointerRNA *properties, struct ReportList *reports){return 0;}
int WM_operatortype_remove(const char *idname){return 0;}
int WM_operator_poll(struct bContext *C, struct wmOperatorType *ot){return 0;}
+int WM_operator_poll_context(struct bContext *C, struct wmOperatorType *ot, int context){return 0;}
int WM_operator_props_popup(struct bContext *C, struct wmOperator *op, struct wmEvent *event){return 0;}
void WM_operator_properties_free(struct PointerRNA *ptr){}
void WM_operator_properties_create(struct PointerRNA *ptr, const char *opstring){}