merge from master

1 files changed, 29 insertions, 25 deletions

diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h
index 89853b8849f..47272255012 100644
--- a/source/blender/collada/collada.h
+++ b/source/blender/collada/collada.h
@@ -64,31 +64,35 @@ int collada_import(struct bContext *C,
 
 				   int keep_bind_info);
 
-int collada_export(struct bContext *C,
-                   const char *filepath,
-                   int apply_modifiers,
-                   BC_export_mesh_type export_mesh_type,
-
-                   int selected,
-                   int include_children,
-                   int include_armatures,
-                   int include_shapekeys,
-                   int deform_bones_only,
-                   int sampling_rate,
-
-                   int active_uv_only,
-                   int include_material_textures,
-                   int use_texture_copies,
-
-                   int triangulate,
-                   int use_object_instantiation,
-                   int use_blender_profile,
-                   int sort_by_name,
-                   BC_export_transformation_type export_transformation_type,
-
-				   int open_sim,
-				   int limit_precision,
-				   int keep_bind_info);
+int collada_export(
+	EvaluationContext *eval_ctx,
+	Scene *sce,
+	const char *filepath,
+
+	int apply_modifiers,
+	BC_export_mesh_type export_mesh_type,
+
+	int selected,
+	int include_children,
+	int include_armatures,
+	int include_shapekeys,
+	int deform_bones_only,
+	int include_animations,
+	int sampling_rate,
+
+	int active_uv_only,
+	int include_material_textures,
+	int use_texture_copies,
+
+	int triangulate,
+	int use_object_instantiation,
+	int use_blender_profile,
+	int sort_by_name,
+	BC_export_transformation_type export_transformation_type,
+
+	int open_sim,
+	int limit_precision,
+	int keep_bind_info);
 
 #ifdef __cplusplus
 }