diff options
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 33 |
3 files changed, 30 insertions, 7 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index e0afd84db82..38a287c6537 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -138,6 +138,7 @@ endif() bf_intern_moto bf_nodes bf_gpu + bf_intern_gawain bf_imbuf bf_avi ge_logic_network diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt index 0e570e19258..d2c2129532a 100644 --- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt +++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt @@ -35,11 +35,12 @@ set(INC ../../blender/blenloader ../../blender/makesdna ../../blender/makesrna + ../../../intern/glew-mx ../../../intern/guardedalloc ) set(INC_SYS - + ${GLEW_INCLUDE_PATH} ) set(SRC diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 300185b3b16..858e1de9176 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -45,6 +45,7 @@ struct ARegion; struct ARegionType; struct BMEditMesh; struct Base; +struct BaseLegacy; struct bContext; struct BoundBox; struct Brush; @@ -178,11 +179,14 @@ struct wmWindowManager; #include "../blender/editors/include/UI_resources.h" #include "../blender/editors/include/UI_view2d.h" #include "../blender/freestyle/FRS_freestyle.h" +#include "../blender/gpu/GPU_immediate.h" +#include "../blender/gpu/GPU_matrix.h" #include "../blender/python/BPY_extern.h" #include "../blender/render/extern/include/RE_engine.h" #include "../blender/render/extern/include/RE_pipeline.h" #include "../blender/render/extern/include/RE_render_ext.h" #include "../blender/render/extern/include/RE_shader_ext.h" +#include "../blender/draw/DRW_engine.h" #include "../blender/windowmanager/WM_api.h" @@ -413,7 +417,7 @@ 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 +struct PTCacheEdit *PE_get_current(struct Scene *scene, struct SceneLayer *sl, struct Object *ob) RET_NULL void PE_current_changed(struct Scene *scene, struct Object *ob) RET_NONE /* rna keymap */ @@ -487,7 +491,8 @@ void ED_view3d_shade_update(struct Main *bmain, struct Scene *scene, struct View void ED_node_shader_default(const struct bContext *C, struct ID *id) RET_NONE void ED_screen_animation_timer_update(struct bScreen *screen, int redraws, int refresh) RET_NONE struct bScreen *ED_screen_animation_playing(const struct wmWindowManager *wm) RET_NULL -void ED_base_object_select(struct Base *base, short mode) RET_NONE +void ED_base_object_select(struct BaseLegacy *base, short mode) RET_NONE +void ED_object_base_select(struct Base *base, short mode) RET_NONE bool ED_object_modifier_remove(struct ReportList *reports, struct Main *bmain, struct Object *ob, struct ModifierData *md) RET_ZERO struct ModifierData *ED_object_modifier_add(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob, const char *name, int type) RET_ZERO void ED_object_modifier_clear(struct Main *bmain, struct Object *ob) RET_NONE @@ -508,7 +513,7 @@ void uiLayoutSetAlignment(uiLayout *layout, char alignment) RET_NONE void uiLayoutSetScaleX(struct uiLayout *layout, float scale) RET_NONE void uiLayoutSetScaleY(struct uiLayout *layout, float scale) RET_NONE void uiTemplateIconView(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname, int show_labels, float icon_scale) RET_NONE -void ED_base_object_free_and_unlink(struct Main *bmain, struct Scene *scene, struct Base *base) RET_NONE +void ED_base_object_free_and_unlink(struct Main *bmain, struct Scene *scene, struct Object *base) RET_NONE void ED_mesh_update(struct Mesh *mesh, struct bContext *C, int calc_edges, int calc_tessface) RET_NONE void ED_mesh_vertices_add(struct Mesh *mesh, struct ReportList *reports, int count) RET_NONE void ED_mesh_edges_add(struct Mesh *mesh, struct ReportList *reports, int count) RET_NONE @@ -534,7 +539,7 @@ int ED_mesh_mirror_spatial_table(struct Object *ob, struct BMEditMesh *em, struc float ED_rollBoneToVector(EditBone *bone, const float new_up_axis[3], const bool axis_only) RET_ZERO void ED_space_image_get_size(struct SpaceImage *sima, int *width, int *height) RET_NONE -bool ED_space_image_check_show_maskedit(struct Scene *scene, struct SpaceImage *sima) RET_ZERO +bool ED_space_image_check_show_maskedit(struct SceneLayer *sl, struct SpaceImage *sima) RET_ZERO bool ED_texture_context_check_world(const struct bContext *C) RET_ZERO bool ED_texture_context_check_material(const struct bContext *C) RET_ZERO @@ -545,9 +550,9 @@ 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 SnapObjectContext *ED_transform_snap_object_context_create( - struct Main *bmain, struct Scene *scene, int flag) RET_NULL + struct Main *bmain, struct Scene *scene, struct SceneLayer *sl, int flag) RET_NULL SnapObjectContext *ED_transform_snap_object_context_create_view3d( - struct Main *bmain, struct Scene *scene, int flag, + struct Main *bmain, struct Scene *scene, struct SceneLayer *sl, int flag, const struct ARegion *ar, const struct View3D *v3d) RET_NULL void ED_transform_snap_object_context_destroy(SnapObjectContext *sctx) RET_NONE bool ED_transform_snap_object_project_ray_ex( @@ -598,6 +603,13 @@ const char *uiLayoutIntrospect(uiLayout *layout) RET_NULL void UI_reinit_font(void) RET_NONE int UI_rnaptr_icon_get(struct bContext *C, struct PointerRNA *ptr, int rnaicon, const bool big) RET_ZERO struct bTheme *UI_GetTheme(void) RET_NULL +void UI_GetThemeColor3fv(int colorid, float col[4]) RET_NONE +void UI_GetThemeColor4fv(int colorid, float col[4]) RET_NONE +void UI_GetThemeColorShade4fv(int colorid, int offset, float col[4]) RET_NONE +void UI_GetThemeColorShadeAlpha4fv(int colorid, int coloffset, int alphaoffset, float col[4]) RET_NONE +void UI_GetThemeColorBlendShade4fv(int colorid1, int colorid2, float fac, int offset, float col[4]) RET_NONE +void UI_GetThemeColorBlend3ubv(int colorid1, int colorid2, float fac, unsigned char col[3]) RET_NONE +void UI_GetThemeColorShadeAlpha4ubv(int colorid, int coloffset, int alphaoffset, unsigned char col[4]) RET_NONE /* rna template */ void uiTemplateAnyID(uiLayout *layout, struct PointerRNA *ptr, const char *propname, const char *proptypename, const char *text) RET_NONE @@ -631,6 +643,7 @@ void uiTemplateNodeView(struct uiLayout *layout, struct bContext *C, struct bNod void uiTemplateTextureUser(struct uiLayout *layout, struct bContext *C) RET_NONE void uiTemplateTextureShow(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop) RET_NONE void uiTemplateKeymapItemProperties(struct uiLayout *layout, struct PointerRNA *ptr) RET_NONE +void uiTemplateOverrideProperty(struct uiLayout *layout, struct PointerRNA *collection_props_ptr, struct PointerRNA *scene_props_ptr, const char *name, const char *custom_template) RET_NONE void uiTemplateMovieClip(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, int compact) RET_NONE void uiTemplateMovieclipInformation(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname, struct PointerRNA *userptr) RET_NONE void uiTemplateTrack(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname) RET_NONE @@ -663,6 +676,7 @@ void RE_ReleaseResultImage(struct Render *re) RET_NONE int RE_engine_test_break(struct RenderEngine *engine) RET_ZERO void RE_engines_init() RET_NONE void RE_engines_exit() RET_NONE +void RE_engines_register(struct Main *bmain, RenderEngineType *render_type) RET_NONE void RE_engine_report(struct RenderEngine *engine, int type, const char *msg) RET_NONE ListBase R_engines = {NULL, NULL}; void RE_engine_free(struct RenderEngine *engine) RET_NONE @@ -679,6 +693,12 @@ void RE_instance_get_particle_info(struct ObjectInstanceRen *obi, float *index, void RE_FreeAllPersistentData(void) RET_NONE float RE_fresnel_dielectric(float incoming[3], float normal[3], float eta) RET_ZERO +/* Draw */ +void OBJECT_collection_settings_create(struct IDProperty *properties) RET_NONE +void EDIT_MESH_collection_settings_create(struct IDProperty *properties) RET_NONE +void EDIT_ARMATURE_collection_settings_create(struct IDProperty *properties) RET_NONE +void DRW_object_engine_data_free(struct Object *ob) RET_NONE + /* python */ struct wmOperatorType *WM_operatortype_find(const char *idname, bool quiet) RET_NULL void WM_operatortype_iter(struct GHashIterator *ghi) RET_NONE @@ -720,6 +740,7 @@ int UI_pie_menu_invoke_from_operator_enum(struct bContext *C, const char *title, /* RNA COLLADA dependency */ int collada_export(struct Scene *sce, + struct SceneLayer *scene_layer, const char *filepath, int apply_modifiers, BC_export_mesh_type export_mesh_type, |