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>2016-09-24 02:27:37 +0300
committerGaia Clary <gaia.clary@machinimatrix.org>2016-09-24 02:27:37 +0300
commit7a259d8422b9fd29fb9990269821fa64fc146a01 (patch)
tree131a7ceff66c61be00ea3b58670e5b5599043e62 /source/blender/collada
parent4b891b40c218ef5f45706cbc4636a5333469dd1c (diff)
Collada: Trying to get rif of some warning messages on linux
Diffstat (limited to 'source/blender/collada')
-rw-r--r--source/blender/collada/ArmatureImporter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp
index 0d5c482aef5..4a5775cabe0 100644
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/collada/ArmatureImporter.cpp
@@ -52,10 +52,10 @@ static const char *bc_get_joint_name(T *node)
ArmatureImporter::ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, Scene *sce, const ImportSettings *import_settings) :
- import_settings(import_settings),
+ scene(sce),
unit_converter(conv),
+ import_settings(import_settings),
TransformReader(conv),
- scene(sce),
empty(NULL),
mesh_importer(mesh) {
}