Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-02-26 11:33:53 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-02-26 11:35:45 +0300
commitf1bd96a9abc92defedcdfd9a0d57aa41277e8767 (patch)
tree059bb55548616867b054b2589684f2d2340d5eec /source/blender/makesrna/intern
parent3fd5a4047ccac755b1924d5caa04d21f99119abb (diff)
Revert "changing collada parameters"
This reverts commit d91f2ac37aa02d96a00d116fa55cdc9f55afd32c. This change makes scene.collada_export() meaningless (ignoring the scene the method is being run on).
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r--source/blender/makesrna/intern/rna_scene_api.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index d641ee12366..7d95fbf4068 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -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 */