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:
authorGaia Clary <gaia.clary@machinimatrix.org>2018-11-24 16:24:36 +0300
committerGaia Clary <gaia.clary@machinimatrix.org>2018-11-24 16:30:19 +0300
commit0c8b0771f26120d557c80df1a30905c8228fd702 (patch)
treea0d52c27b7a4b19d9b140942ffeb58f79dceded3 /source/blender/collada/SceneExporter.h
parent31e3b7790affbde212bb2ccc6d5195a684010928 (diff)
refactor: Collada reorganize class constructors
- Class constructors without body (only attribute initialisations) can safely be kept in the class header files - Constructor variables should be initialized in the order of their definition in the header files This change is also aimed to remove a couple of build warnings from the linux builds.
Diffstat (limited to 'source/blender/collada/SceneExporter.h')
-rw-r--r--source/blender/collada/SceneExporter.h16
1 files changed, 12 insertions, 4 deletions
diff --git a/source/blender/collada/SceneExporter.h b/source/blender/collada/SceneExporter.h
index f4868f527ab..f6525d5438d 100644
--- a/source/blender/collada/SceneExporter.h
+++ b/source/blender/collada/SceneExporter.h
@@ -94,18 +94,26 @@ extern "C" {
class SceneExporter: COLLADASW::LibraryVisualScenes, protected TransformWriter, protected InstanceWriter
{
public:
- SceneExporter(BlenderContext &blender_context, COLLADASW::StreamWriter *sw, ArmatureExporter *arm, const ExportSettings *export_settings);
+
+ SceneExporter(BlenderContext &blender_context, COLLADASW::StreamWriter *sw, ArmatureExporter *arm, const ExportSettings *export_settings) :
+ COLLADASW::LibraryVisualScenes(sw),
+ blender_context(blender_context),
+ arm_exporter(arm),
+ export_settings(export_settings)
+ {}
+
void exportScene();
private:
- friend class ArmatureExporter;
BlenderContext &blender_context;
+ friend class ArmatureExporter;
+ ArmatureExporter *arm_exporter;
+ const ExportSettings *export_settings;
+
void exportHierarchy();
void writeNodeList(std::vector<Object *> &child_objects, Object *parent);
void writeNodes(Object *ob);
- ArmatureExporter *arm_exporter;
- const ExportSettings *export_settings;
};
#endif