[Bf-blender-cvs] [569ad49a01e] collada2.8: fix: Collada: remove not needed Context attribute from DocumentExporter
Gaia Clary
noreply at git.blender.org
Wed Nov 14 14:53:46 CET 2018
Commit: 569ad49a01e83704bb0b3600350fccd3235acba9
Author: Gaia Clary
Date: Thu Nov 1 19:45:57 2018 +0100
Branches: collada2.8
https://developer.blender.org/rB569ad49a01e83704bb0b3600350fccd3235acba9
fix: Collada: remove not needed Context attribute from DocumentExporter
===================================================================
M source/blender/collada/DocumentExporter.cpp
M source/blender/collada/DocumentExporter.h
===================================================================
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp
index 6aea8a50c64..a87c05fe9bb 100644
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@ -182,7 +182,7 @@ static COLLADABU::NativeString make_temp_filepath(const char *name, const char *
int DocumentExporter::exportCurrentScene(bContext *C, Scene *sce)
{
- Main *bmain = CTX_data_main(mContext);
+ Main *bmain = CTX_data_main(C);
PointerRNA sceneptr, unit_settings;
PropertyRNA *system; /* unused , *scale; */
@@ -291,7 +291,7 @@ int DocumentExporter::exportCurrentScene(bContext *C, Scene *sce)
}
// <library_controllers>
- ArmatureExporter arm_exporter(mContext, writer, this->export_settings);
+ ArmatureExporter arm_exporter(C, writer, this->export_settings);
ControllerExporter controller_exporter(writer, this->export_settings);
if (bc_has_object_type(export_set, OB_ARMATURE) || this->export_settings->include_shapekeys)
{
@@ -300,7 +300,7 @@ int DocumentExporter::exportCurrentScene(bContext *C, Scene *sce)
// <library_visual_scenes>
- SceneExporter se(mContext, writer, &arm_exporter, this->export_settings);
+ SceneExporter se(C, writer, &arm_exporter, this->export_settings);
if (this->export_settings->include_animations) {
// <library_animations>
diff --git a/source/blender/collada/DocumentExporter.h b/source/blender/collada/DocumentExporter.h
index 774aa953aca..743df6f04c8 100644
--- a/source/blender/collada/DocumentExporter.h
+++ b/source/blender/collada/DocumentExporter.h
@@ -44,7 +44,6 @@ class DocumentExporter
void exportScenes(const char *filename);
private:
Depsgraph *depsgraph;
- bContext *mContext;
const ExportSettings *export_settings;
};
More information about the Bf-blender-cvs
mailing list