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/ControllerExporter.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/ControllerExporter.h')
-rw-r--r--source/blender/collada/ControllerExporter.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/collada/ControllerExporter.h b/source/blender/collada/ControllerExporter.h
index 6a3ea7cc023..309bdbd37f0 100644
--- a/source/blender/collada/ControllerExporter.h
+++ b/source/blender/collada/ControllerExporter.h
@@ -60,7 +60,14 @@ class SceneExporter;
class ControllerExporter : public COLLADASW::LibraryControllers, protected TransformWriter, protected InstanceWriter
{
public:
- ControllerExporter(BlenderContext &blender_context, COLLADASW::StreamWriter *sw, const ExportSettings *export_settings);
+ // XXX exporter writes wrong data for shared armatures. A separate
+ // controller should be written for each armature-mesh binding how do
+ // we make controller ids then?
+ ControllerExporter(BlenderContext &blender_context, COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) :
+ COLLADASW::LibraryControllers(sw),
+ blender_context(blender_context),
+ export_settings(export_settings) {
+ }
bool is_skinned_mesh(Object *ob);
@@ -72,7 +79,6 @@ public:
private:
BlenderContext &blender_context;
- UnitConverter converter;
const ExportSettings *export_settings;
#if 0