diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-24 07:39:20 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-24 07:39:20 +0400 |
| commit | d120ec146d3c28b7243371b0de1edf4ba590470c (patch) | |
| tree | a05f182978c6007bb9193f6ad0b4f2b210394ee8 /source/blenderplayer | |
| parent | 3df023ae82eef0ea105dc61c9730af87b59a07d1 (diff) | |
| parent | 93c3593d825aafe30aaf051182e50bde4c6084dd (diff) | |
Merged changes in the trunk up to revision 54802.
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 21443fba8b7..5e8a0b2a06b 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -328,7 +328,7 @@ void ED_screen_animation_playing(struct wmWindowManager *wm) {} void ED_base_object_select(struct Base *base, short mode) {} int ED_object_modifier_remove(struct ReportList *reports, struct Scene *scene, struct Object *ob, struct ModifierData *md) {return 0;} int ED_object_modifier_add(struct ReportList *reports, struct Scene *scene, struct Object *ob, char *name, int type) {return 0;} -void ED_object_modifier_clear(struct Scene *scene, struct Object *ob) {} +void ED_object_modifier_clear(struct Main *bmain, struct Object *ob) {} void ED_object_enter_editmode(struct bContext *C, int flag) {} void ED_object_exit_editmode(struct bContext *C, int flag) {} int uiLayoutGetActive(struct uiLayout *layout) {return 0;} |