diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-05-02 12:00:26 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-05-02 12:00:26 +0300 |
| commit | 5aa19be91263a249ffae75573e3b32f24269d890 (patch) | |
| tree | ae66261f5024abd8362855ce18205c5b49b1d378 /source/blenderplayer | |
| parent | c1ca667d4a9f42cda9dd7486f9826db07baacd2a (diff) | |
| parent | 1f723603c882e6d79ab69bea6e5c034ae21a6ce7 (diff) | |
Merge branch 'temp_remove_particles' into blender2.8
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 78a6ad27fad..f471b535838 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -162,7 +162,6 @@ struct wmWindowManager; #include "../blender/editors/include/ED_mesh.h" #include "../blender/editors/include/ED_node.h" #include "../blender/editors/include/ED_object.h" -#include "../blender/editors/include/ED_particle.h" #include "../blender/editors/include/ED_render.h" #include "../blender/editors/include/ED_screen.h" #include "../blender/editors/include/ED_space_api.h" @@ -390,9 +389,6 @@ void ED_fsmenu_entry_set_path(struct FSMenuEntry *fsentry, const char *name) RET char *ED_fsmenu_entry_get_name(struct FSMenuEntry *fsentry) RET_NULL void ED_fsmenu_entry_set_name(struct FSMenuEntry *fsentry, const char *name) RET_NONE -struct PTCacheEdit *PE_get_current(struct Scene *scene, struct Object *ob) RET_NULL -void PE_current_changed(struct Scene *scene, struct Object *ob) RET_NONE - /* rna keymap */ struct wmKeyMap *WM_keymap_active(struct wmWindowManager *wm, struct wmKeyMap *keymap) RET_NULL struct wmKeyMap *WM_keymap_find(struct wmKeyConfig *keyconf, const char *idname, int spaceid, int regionid) RET_NULL @@ -516,7 +512,6 @@ bool ED_space_image_check_show_maskedit(struct Scene *scene, struct SpaceImage * bool ED_texture_context_check_world(const struct bContext *C) RET_ZERO bool ED_texture_context_check_material(const struct bContext *C) RET_ZERO bool ED_texture_context_check_lamp(const struct bContext *C) RET_ZERO -bool ED_texture_context_check_particles(const struct bContext *C) RET_ZERO bool ED_texture_context_check_others(const struct bContext *C) RET_ZERO bool ED_text_region_location_from_cursor(SpaceText *st, ARegion *ar, const int cursor_co[2], int r_pixel_co[2]) RET_ZERO |