diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-27 03:49:13 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-27 03:49:13 +0400 |
| commit | 556912792ad3c37c294256a558c96b39f264e7b5 (patch) | |
| tree | 9b6ee8cf1ad92ee89c04f27a89be11599c5b40c0 /source/blenderplayer | |
| parent | 9251d628db0abe599d927d79170025d8545c8ace (diff) | |
| parent | c84383301c5a2582e95259a7e4468a23a3566401 (diff) | |
Merged changes in the trunk up to revision 54110.
Conflicts resolved:
source/blender/blenfont/SConscript
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_scene.c
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index d606605e8d5..b2a47115630 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -95,6 +95,7 @@ endif() bf_rna bf_bmesh bf_blenkernel + bf_rigidbody bf_blenloader ge_blen_routines bf_editor_datafiles diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 71881a99419..dc6f40b9e8a 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -121,6 +121,7 @@ struct wmEvent; struct wmKeyConfig; struct wmKeyMap; struct wmOperator; +struct wmOperatorType; struct wmWindow; struct wmWindowManager; @@ -203,6 +204,7 @@ int WM_operator_props_dialog_popup(struct bContext *C, struct wmOperator *op, in int WM_operator_confirm(struct bContext *C, struct wmOperator *op, struct wmEvent *event) {return 0;} struct MenuType *WM_menutype_find(const char *idname, int quiet) {return (struct MenuType *) NULL;} void WM_operator_stack_clear(struct bContext *C) {} +void WM_operator_handlers_clear(struct bContext *C, struct wmOperatorType *ot) {} void WM_autosave_init(struct bContext *C) {} void WM_jobs_kill_all_except(struct wmWindowManager *wm) {} @@ -341,6 +343,7 @@ void uiLayoutSetEnabled(struct uiLayout *layout, int enabled) {} void uiLayoutSetAlignment(struct uiLayout *layout, int alignment) {} void uiLayoutSetScaleX(struct uiLayout *layout, float scale) {} void uiLayoutSetScaleY(struct uiLayout *layout, float scale) {} +void uiTemplateIconView(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname) {} void ED_base_object_free_and_unlink(struct Scene *scene, struct Base *base) {} void ED_mesh_calc_normals(struct Mesh *me) {} void ED_mesh_geometry_add(struct Mesh *mesh, struct ReportList *reports, int verts, int edges, int faces) {} @@ -533,6 +536,7 @@ void macro_wrapper(struct wmOperatorType *ot, void *userdata) {} int pyrna_id_FromPyObject(struct PyObject *obj, struct ID **id) { return 0; } struct PyObject *pyrna_id_CreatePyObject(struct ID *id) {return NULL; } void BPY_context_update(struct bContext *C) {}; +const char *BPY_app_translations_py_pgettext(const char *msgctxt, const char *msgid) { return msgid; } #ifdef WITH_FREESTYLE /* Freestyle */ |