Commit: 36d0ea3123743e675333e90c712c69d666fe5710
Author: Gaia Clary
Date: Sat Sep 24 01:47:55 2016 +0200
Branches: master
https://developer.blender.org/rB36d0ea3123743e675333e90c712c69d666fe5710
Collada: Trying to get rid 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 4a5775c..ae43c0a 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) :
+ TransformReader(conv),
scene(sce),
unit_converter(conv),
import_settings(import_settings),
- TransformReader(conv),
empty(NULL),
mesh_importer(mesh) {
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
