diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-19 20:06:27 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-19 20:14:05 +0300 |
commit | 5e81d993afadc6b5d37410e91998395caf1d1281 (patch) | |
tree | ec57394bb9e74110a21b086678535e17c65524db /source/blenderplayer | |
parent | b5bf3011bf3851d1e68dbcdde310fff04dc3f2f5 (diff) | |
parent | a3486e735f7e5af6ca78dafc8608cced5a121096 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blenderplayer')
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 751d96d5c51..03fd58bfbcd 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -631,13 +631,9 @@ bool ED_transform_snap_object_project_ray_ex( struct Object **r_ob, float r_obmat[4][4]) RET_ZERO void BIF_selectTransformOrientationValue(struct View3D *v3d, int orientation) RET_NONE -void ED_lattice_editlatt_make(struct Object *obedit) RET_NONE -void ED_lattice_editlatt_load(struct Object *obedit) RET_NONE - void ED_curve_editnurb_load(struct Object *obedit) RET_NONE void ED_curve_editnurb_make(struct Object *obedit) RET_NONE - void uiItemR(uiLayout *layout, struct PointerRNA *ptr, const char *propname, int flag, const char *name, int icon) RET_NONE void uiItemFullO(uiLayout *layout, const char *idname, const char *name, int icon, struct IDProperty *properties, int context, int flag, struct PointerRNA *r_opptr) RET_NONE |