fix: adjusted collada declaration after changes in collada module.
authorGaia Clary <gaia.clary@machinimatrix.org>
Sun, 25 Jun 2017 08:50:03 +0000 (10:50 +0200)
committerGaia Clary <gaia.clary@machinimatrix.org>
Sun, 25 Jun 2017 08:50:19 +0000 (10:50 +0200)
@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.

source/blenderplayer/bad_level_call_stubs/stubs.c

index 475937c5cd153e8c76d4a8e0e5b559dd40d07968..248bd3e2c9034fee1e4dc88c0e3f2edd5ec12ce5 100644 (file)
@@ -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