diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-25 05:39:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-25 05:39:47 +0300 |
| commit | 0c93bc2b637a6a3fe01b174dad2fb61895d004d2 (patch) | |
| tree | b877a434d2a7af2dfdf727b9794fa46359ba670a /source/blenderplayer | |
| parent | 5d6e9f237be3379b63169f86b8f4117752d095b3 (diff) | |
| parent | a7f16c17c260f311e136758497e5490b226ebc03 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 09869664d62..41c3c3aef1a 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -756,7 +756,8 @@ int collada_export(struct Scene *sce, int use_blender_profile, int sort_by_name, BC_export_transformation_type export_transformation_type, - int open_sim) RET_ZERO + int open_sim, + int keep_bind_info) RET_ZERO void ED_mesh_calc_tessface(struct Mesh *mesh, bool free_mpoly) RET_NONE |