diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-13 18:15:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-13 18:15:37 +0300 |
| commit | 585208e0e911c985a062dd74b6cc689e4fb63ef8 (patch) | |
| tree | d390abe6663c5619d34dc929d68a24775d24d7fb /source/blenderplayer | |
| parent | c99c45a1e3563f4b6dad6eb9498a5ae0f386b93d (diff) | |
| parent | be25a0faa7ff0f64e9d75f5f48c042bb8595f142 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 1f0d5b0a338..751d96d5c51 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -243,7 +243,7 @@ void DRW_deferred_shader_remove(struct GPUMaterial *mat) RET_NONE /*new render funcs */ void EDBM_selectmode_set(struct BMEditMesh *em) RET_NONE void EDBM_mesh_load(struct Object *ob) RET_NONE -void EDBM_mesh_make(struct ToolSettings *ts, struct Object *ob, const bool use_key_index) RET_NONE +void EDBM_mesh_make(struct Object *ob, const int select_mode, const bool use_key_index) RET_NONE void EDBM_mesh_normals_update(struct BMEditMesh *em) RET_NONE void *g_system; bool EDBM_uv_check(struct BMEditMesh *em) RET_ZERO |