diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2017-06-25 11:50:03 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2017-06-25 11:50:19 +0300 |
| commit | d17786b107a8c8c42c056f5e951fbe4c9d993f83 (patch) | |
| tree | 46cc32adfafb65cb748e589d597e14bb11684ebd /source/blenderplayer | |
| parent | bdacb60a92d2c0ba348daa48e9cdd614fbf512f2 (diff) | |
fix: adjusted collada declaration after changes in collada module.
@campbell Barton: Why is this declaration needed at all in stubs.c?
Further up the file collada.h is imported and that already decalres
the function and results in a duplicate declaration.
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 475937c5cd1..248bd3e2c90 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -721,7 +721,9 @@ struct uiLayout *uiLayoutRadial(struct uiLayout *layout) RET_NULL int UI_pie_menu_invoke_from_operator_enum(struct bContext *C, const char *title, const char *opname, const char *propname, const struct wmEvent *event) RET_ZERO -/* RNA COLLADA dependency */ +/* RNA COLLADA dependency */ +/* XXX (gaia) Why do we need this declaration here? */ +/* The collada header is included anyways further up... */ int collada_export(struct Scene *sce, const char *filepath, int apply_modifiers, @@ -734,8 +736,7 @@ int collada_export(struct Scene *sce, int deform_bones_only, int active_uv_only, - int include_uv_textures, - int include_material_textures, + BC_export_texture_type export_texture_type, int use_texture_copies, int triangulate, @@ -745,7 +746,7 @@ int collada_export(struct Scene *sce, BC_export_transformation_type export_transformation_type, int open_sim, int limit_precision, - int keep_bind_info) RET_ZERO + int keep_bind_info); void ED_mesh_calc_tessface(struct Mesh *mesh, bool free_mpoly) RET_NONE |