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:
authorCampbell Barton <ideasman42@gmail.com>2010-11-04 01:44:39 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-11-04 01:44:39 +0300
commitdba1904f657ab9b90aaea3ceed6dad97ec4ad951 (patch)
treeff8dba823a4b34766d4d88d224221877cd311daa /source/blender/collada/MeshImporter.h
parentce3b49742decf64b3cb600dd2091feac07330b7b (diff)
bugfix [#24518] Blender wont compile with -Wall -Werror and COLLADA support
fix included in report from Martijn Berger (mberger) made some small changes. - use ints rather then unsigned long for printing, values are not likely to be very large. - CMake remove strict flags from collada build dir since I had warnings in the collada headers. - added xml2 to collada libraries else I couldnt get collada building.
Diffstat (limited to 'source/blender/collada/MeshImporter.h')
-rw-r--r--source/blender/collada/MeshImporter.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/MeshImporter.h b/source/blender/collada/MeshImporter.h
index 055c4798855..c5ab6e94561 100644
--- a/source/blender/collada/MeshImporter.h
+++ b/source/blender/collada/MeshImporter.h
@@ -72,6 +72,8 @@ class MeshImporter : public MeshImporterBase
{
private:
+ UnitConverter *unitconverter;
+
Scene *scene;
ArmatureImporter *armature_importer;
@@ -120,8 +122,6 @@ private:
bool flat_face(unsigned int *nind, COLLADAFW::MeshVertexData& nor, int count);
- UnitConverter *unitconverter;
-
public:
MeshImporter(UnitConverter *unitconv, ArmatureImporter *arm, Scene *sce);