diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-10 14:17:59 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-10 14:17:59 +0400 |
| commit | ac9ec06ec121589fedbfeaa10137140b45bfd668 (patch) | |
| tree | ab08f9528136f0b8813593b78621f869d98d655e /source/blenderplayer | |
| parent | 3c064f4553e4be988fe4fcec450b59b935fa3c80 (diff) | |
| parent | 63af7068ad17f30a526ccb81fbe74253b064bc89 (diff) | |
Merged changes in the trunk up to revision 54421.
Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/properties_render.py
source/blender/SConscript
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index b2a47115630..fb06c5e4477 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -95,7 +95,7 @@ endif() bf_rna bf_bmesh bf_blenkernel - bf_rigidbody + bf_intern_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 2603df2aec8..deb7cae9f77 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -390,6 +390,7 @@ void make_editNurb(struct Object *obedit) {} void uiItemR(struct uiLayout *layout, struct PointerRNA *ptr, char *propname, int flag, char *name, int icon) {} struct PointerRNA uiItemFullO(struct uiLayout *layout, char *idname, char *name, int icon, struct IDProperty *properties, int context, int flag) {struct PointerRNA a = {{0}}; return a;} +PointerRNA uiItemFullO_ptr(struct uiLayout *layout, struct wmOperatorType *ot, const char *name, int icon, struct IDProperty *properties, int context, int flag) {struct PointerRNA a = {{0}}; return a;} struct uiLayout *uiLayoutRow(struct uiLayout *layout, int align) {return (struct uiLayout *) NULL;} struct uiLayout *uiLayoutColumn(struct uiLayout *layout, int align) {return (struct uiLayout *) NULL;} struct uiLayout *uiLayoutColumnFlow(struct uiLayout *layout, int number, int align) {return (struct uiLayout *) NULL;} |