Revert "changing collada parameters"
authorCampbell Barton <ideasman42@gmail.com>
Mon, 26 Feb 2018 08:33:53 +0000 (19:33 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 26 Feb 2018 08:35:45 +0000 (19:35 +1100)
This reverts commit d91f2ac37aa02d96a00d116fa55cdc9f55afd32c.

This change makes scene.collada_export() meaningless
(ignoring the scene the method is being run on).

source/blender/collada/collada.cpp
source/blender/collada/collada.h
source/blender/editors/io/io_collada.c
source/blender/makesrna/intern/rna_scene_api.c
source/blenderplayer/bad_level_call_stubs/stubs.c

index 718ae1d876b4bacdde44b51322cf6d2cd20987ea..79f50888150026d98ef64369ca343fe450f4fe40 100644 (file)
@@ -67,7 +67,7 @@ int collada_import(bContext *C,
        return 0;
 }
 
-int collada_export(bContext *C,
+int collada_export(Scene *sce,
                    const char *filepath,
 
                    int apply_modifiers,
@@ -124,7 +124,6 @@ int collada_export(bContext *C,
        if (export_settings.include_children) includeFilter |= OB_REL_CHILDREN_RECURSIVE;
 
        eObjectSet objectSet = (export_settings.selected) ? OB_SET_SELECTED : OB_SET_ALL;
-       Scene *sce = CTX_data_scene(C);
        export_settings.export_set = BKE_object_relational_superset(sce, objectSet, (eObRelationTypes)includeFilter);
        int export_count = BLI_linklist_count(export_settings.export_set);
 
index e546e1f10567d3da8c218a0538e7b7997cf7e2ff..a8f082f630c8f8c0061f08d6f8c959df776c5bb8 100644 (file)
@@ -67,7 +67,7 @@ int collada_import(struct bContext *C,
 
                                   int keep_bind_info);
 
-int collada_export(struct bContext *C,
+int collada_export(struct Scene *sce,
                    const char *filepath,
                    int apply_modifiers,
                    BC_export_mesh_type export_mesh_type,
index 7f5442bbca4cd257e7413d4ae5d25ee04bda040d..3746ba3b64a9c0d5157a268ea82a9331f03160d8 100644 (file)
@@ -158,7 +158,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
        ED_object_editmode_load(CTX_data_edit_object(C));
 
 
-       export_count = collada_export(C,
+       export_count = collada_export(CTX_data_scene(C),
                filepath,
                apply_modifiers,
                export_mesh_type,
index d641ee123668168945101a86ac9d0b99507ed64f..7d95fbf4068c133aa8d9cb2062ac1caa941de7a0 100644 (file)
@@ -268,7 +268,7 @@ static void rna_Scene_alembic_export(
 
 /* Note: This definition must match to the generated function call */
 static void rna_Scene_collada_export(
-        bContext *C,
+        Scene *scene,
         const char *filepath, 
         int apply_modifiers,
 
@@ -291,7 +291,7 @@ static void rna_Scene_collada_export(
         int limit_precision,
         int keep_bind_info)
 {
-       collada_export(C,
+       collada_export(scene,
                filepath,
 
                apply_modifiers,
@@ -379,7 +379,6 @@ void RNA_api_scene(StructRNA *srna)
 #ifdef WITH_COLLADA
        /* don't remove this, as COLLADA exporting cannot be done through operators in render() callback. */
        func = RNA_def_function(srna, "collada_export", "rna_Scene_collada_export");
-       RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_CONTEXT);
        parm = RNA_def_string(func, "filepath", NULL, FILE_MAX, "File Path", "File path to write Collada file");
        RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
        RNA_def_property_subtype(parm, PROP_FILEPATH); /* allow non utf8 */
index f7afa5e0f2cd4d3f862f3528ce3b8ba6e4a653db..85ed589dd78a0e716ab9001387eb88646e883e53 100644 (file)
@@ -729,7 +729,7 @@ int UI_pie_menu_invoke_from_operator_enum(struct bContext *C, const char *title,
 /* RNA COLLADA dependency                                       */
 /* XXX (gaia) Why do we need this declaration here?             */
 /*     The collada header is included anyways further up...     */
-int collada_export(struct bContext *C,
+int collada_export(struct Scene *sce,
                    const char *filepath,
                    int apply_modifiers,
                    BC_export_mesh_type export_mesh_type,