diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-06 02:24:05 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-06 02:24:05 +0400 |
commit | feccbaabbd39c18b2f552964ebd8dfab4eeaed89 (patch) | |
tree | 0069f654883a7a02dd320649ce61bd7933748111 /source/blenderplayer | |
parent | a22096e8019c461128a0907e4026859996ec1b5c (diff) | |
parent | 37ba969c74840142682cf22f34610f3b65b86cf4 (diff) |
Merged changes in the trunk up to revision 53584.
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h
Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup
Diffstat (limited to 'source/blenderplayer')
-rw-r--r-- | source/blenderplayer/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 14 |
2 files changed, 13 insertions, 2 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 85bb07d6e83..d606605e8d5 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -149,6 +149,7 @@ endif() bf_intern_raskter bf_intern_opencolorio bf_intern_opennl + extern_rangetree ) if(WITH_MOD_CLOTH_ELTOPO) diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index f394290d952..71881a99419 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -207,9 +207,15 @@ void WM_operator_stack_clear(struct bContext *C) {} void WM_autosave_init(struct bContext *C) {} void WM_jobs_kill_all_except(struct wmWindowManager *wm) {} -char *WM_clipboard_text_get(int selection) {return (char*)0;} +char *WM_clipboard_text_get(int selection) {return (char *)0;} void WM_clipboard_text_set(char *buf, int selection) {} +void WM_uilisttype_init(void) {} +struct uiListType *WM_uilisttype_find(const char *idname, int quiet) {return (struct uiListType *)NULL;} +int WM_uilisttype_add(struct uiListType *ult) {return 0;} +void WM_uilisttype_freelink(struct uiListType *ult) {} +void WM_uilisttype_free(void) {} + struct wmKeyMapItem *WM_keymap_item_find_id(struct wmKeyMap *keymap, int id) {return (struct wmKeyMapItem *) NULL;} int WM_enum_search_invoke(struct bContext *C, struct wmOperator *op, struct wmEvent *event) {return 0;} void WM_event_add_notifier(const struct bContext *C, unsigned int type, void *reference) {} @@ -407,6 +413,7 @@ void uiItemFullR(struct uiLayout *layout, struct PointerRNA *ptr, struct Propert void uiLayoutSetContextPointer(struct uiLayout *layout, char *name, struct PointerRNA *ptr) {} char *uiLayoutIntrospect(struct uiLayout *layout) {return (char *)NULL;} void UI_reinit_font(void) {} +int UI_rnaptr_icon_get(struct bContext *C, struct PointerRNA *ptr, int rnaicon, int big) {return 0;} /* rna template */ void uiTemplateAnyID(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, char *text) {} @@ -421,7 +428,9 @@ void uiTemplateCurveMapping(struct uiLayout *layout, struct CurveMapping *cumap, void uiTemplateColorRamp(struct uiLayout *layout, struct ColorBand *coba, int expand) {} void uiTemplateLayers(struct uiLayout *layout, struct PointerRNA *ptr, char *propname) {} void uiTemplateImageLayers(struct uiLayout *layout, struct bContext *C, struct Image *ima, struct ImageUser *iuser) {} -ListBase uiTemplateList(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, struct PointerRNA *activeptr, char *activepropname, int rows, int listtype) {struct ListBase b = {0,0}; return b;} +void uiTemplateList(struct uiLayout *layout, struct bContext *C, const char *listtype_name, const char *list_id, + PointerRNA *dataptr, const char *propname, PointerRNA *active_dataptr, + const char *active_propname, int rows, int maxrows, int layout_type) {} void uiTemplateRunningJobs(struct uiLayout *layout, struct bContext *C) {} void uiTemplateOperatorSearch(struct uiLayout *layout) {} void uiTemplateHeader3D(struct uiLayout *layout, struct bContext *C) {} @@ -509,6 +518,7 @@ float sculpt_get_brush_alpha(struct Brush *brush) {return 0.0f;} void sculpt_set_brush_alpha(struct Brush *brush, float alpha) {} void ED_sculpt_modifiers_changed(struct Object *ob) {} void ED_mesh_calc_tessface(struct Mesh *mesh) {} +void BKE_brush_gen_texture_cache(struct Brush *br, int half_side) {} /* bpy/python internal api */ void operator_wrapper(struct wmOperatorType *ot, void *userdata) {} |