diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-01-05 14:24:47 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-01-05 14:24:47 +0300 |
commit | c5ede37a9e936fa0971385e18b4a47274f51c991 (patch) | |
tree | 49501f4f7f56ba0d8274376ae21f580c6ef1152d /source/blenderplayer | |
parent | f929c03791300eb330b0b50e4ac2ab6a4368213a (diff) | |
parent | f902bbad83727ba8c35328aeb75583449eb84e6f (diff) |
Merge branch 'wiggly-widgets' into gooseberry
Conflicts:
source/blender/makesrna/intern/rna_object.c
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blenderplayer')
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 84a6ee89773..9cbed88ac00 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -110,6 +110,7 @@ struct bConstraint; struct bConstraintOb; struct bConstraintTarget; struct bContextDataResult; +struct bFaceMap; struct bNode; struct bNodeType; struct bNodeSocket; @@ -256,19 +257,6 @@ float RE_lamp_get_data(struct ShadeInput *shi, struct Object *lamp_obj, float co /* blenkernel */ bool BKE_paint_proj_mesh_data_check(struct Scene *scene, struct Object *ob, bool *uvs, bool *mat, bool *tex, bool *stencil) RET_ZERO -int fmap_name_index(struct Object *ob, const char *name) RET_ZERO -void fmap_unique_name(struct bFaceMap *fmap, struct Object *ob) RET_NONE -struct bFaceMap *fmap_find_name(struct Object *ob, const char *name) RET_NULL -void fmap_copy_list(struct ListBase *outbase, struct ListBase *inbase) RET_NONE - -struct bFaceMap *BKE_object_facemap_add(struct Object *ob) RET_NULL -struct bFaceMap *BKE_object_facemap_add_name(struct Object *ob, const char *name) RET_NULL -void BKE_object_facemap_remove(struct Object *ob, struct bFaceMap *fmap) RET_NONE -void BKE_object_fmap_remove_all(struct Object *ob) RET_NONE - -void ED_fmap_face_add(struct Object *ob, struct bFaceMap *fmap, int facenum) RET_NONE -void ED_fmap_face_remove(struct Object *ob, struct bFaceMap *fmap, int facenum) RET_NONE - /* render */ void RE_FreeRenderResult(struct RenderResult *res) RET_NONE void RE_FreeAllRenderResults(void) RET_NONE @@ -312,11 +300,11 @@ void WM_cursor_time(struct wmWindow *win, int nr) RET_NONE void WM_cursor_warp(struct wmWindow *win, int x, int y) RET_NONE void WM_widgetmap_delete(struct wmWidgetMap *wmap) RET_NONE -struct wmWidgetMapType *WM_widgetmaptype_find(const char *idname, int spaceid, int regionid, bool is_3d, bool create) RET_NULL; +struct wmWidgetMapType *WM_widgetmaptype_find(const char *idname, int spaceid, int regionid, bool is_3d, bool create) RET_NULL struct wmWidgetGroupType *WM_widgetgrouptype_new(int (*poll)(const struct bContext *, struct wmWidgetGroupType *), - void (*draw)(const struct bContext *, struct wmWidgetGroup *), - struct Main *bmain, const char *mapidname, short spaceid, short regionid, bool is_3d) RET_NULL; -void WM_widgetgrouptype_unregister(struct bContext *C, struct Main *bmain, struct wmWidgetGroupType *wgroup) RET_NONE; + void (*draw)(const struct bContext *, struct wmWidgetGroup *), + struct Main *bmain, const char *mapidname, short spaceid, short regionid, bool is_3d) RET_NULL +void WM_widgetgrouptype_unregister(struct bContext *C, struct Main *bmain, struct wmWidgetGroupType *wgroup) RET_NONE void WM_uilisttype_init(void) RET_NONE struct uiListType *WM_uilisttype_find(const char *idname, bool quiet) RET_NULL @@ -491,6 +479,8 @@ void ED_object_constraint_update(struct Object *ob) RET_NONE void ED_vgroup_vert_add(struct Object *ob, struct bDeformGroup *dg, int vertnum, float weight, int assignmode) RET_NONE void ED_vgroup_vert_remove(struct Object *ob, struct bDeformGroup *dg, int vertnum) RET_NONE float ED_vgroup_vert_weight(struct Object *ob, struct bDeformGroup *dg, int vertnum) RET_ZERO +void ED_fmap_face_add(struct Object *ob, struct bFaceMap *fmap, int facenum) RET_NONE +void ED_fmap_face_remove(struct Object *ob, struct bFaceMap *fmap, int facenum) RET_NONE int ED_mesh_mirror_topo_table(struct Object *ob, char mode) RET_ZERO int ED_mesh_mirror_spatial_table(struct Object *ob, struct BMEditMesh *em, const float co[3], char mode) RET_ZERO |