Commit: 7a259d8422b9fd29fb9990269821fa64fc146a01
Author: Gaia Clary
Date: Sat Sep 24 01:27:37 2016 +0200
Branches: master
https://developer.blender.org/rB7a259d8422b9fd29fb9990269821fa64fc146a01
Collada: Trying to get rif of some warning messages on linux
===================================================================
M source/blender/collada/ArmatureImporter.cpp
===================================================================
diff --git a/source/blender/collada/ArmatureImporter.cpp
b/source/blender/collada/ArmatureImporter.cpp
index 0d5c482..4a5775c 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) {
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
