Index: source/blender/collada/DocumentImporter.cpp =================================================================== --- source/blender/collada/DocumentImporter.cpp (revision 32858) +++ source/blender/collada/DocumentImporter.cpp (working copy) @@ -219,7 +219,7 @@ if (libnode_ob.size()) { Scene *sce = CTX_data_scene(mContext); - fprintf(stderr, "got %u library nodes to free\n", libnode_ob.size()); + fprintf(stderr, "got %lu library nodes to free\n", (unsigned long)libnode_ob.size()); // free all library_nodes std::vector::iterator it; for (it = libnode_ob.begin(); it != libnode_ob.end(); it++) { Index: source/blender/collada/DocumentExporter.cpp =================================================================== --- source/blender/collada/DocumentExporter.cpp (revision 32858) +++ source/blender/collada/DocumentExporter.cpp (working copy) @@ -904,7 +904,7 @@ void DocumentExporter::exportCurrentScene(Scene *sce, const char* filename) { PointerRNA sceneptr, unit_settings; - PropertyRNA *system, *scale; + PropertyRNA *system; /* unused , *scale; */ clear_global_id_map(); Index: source/blender/collada/AnimationImporter.cpp =================================================================== --- source/blender/collada/AnimationImporter.cpp (revision 32858) +++ source/blender/collada/AnimationImporter.cpp (working copy) @@ -131,7 +131,7 @@ } break; default: - fprintf(stderr, "Output dimension of %d is not yet supported (animation id = %s)\n", dim, curve->getOriginalId().c_str()); + fprintf(stderr, "Output dimension of %lu is not yet supported (animation id = %s)\n", (unsigned long)dim, curve->getOriginalId().c_str()); } for (std::vector::iterator it = fcurves.begin(); it != fcurves.end(); it++) @@ -221,7 +221,7 @@ free_fcurve(*it); if (unused_curves.size()) - fprintf(stderr, "removed %u unused curves\n", unused_curves.size()); + fprintf(stderr, "removed %lu unused curves\n", (unsigned long)unused_curves.size()); } bool AnimationImporter::write_animation(const COLLADAFW::Animation* anim) @@ -564,7 +564,7 @@ } } else { - fprintf(stderr, "expected %d curves, got %u\n", xyz ? 3 : 1, curves.size()); + fprintf(stderr, "expected %d curves, got %lu\n", xyz ? 3 : 1, (unsigned long)curves.size()); } } } @@ -902,7 +902,7 @@ if (type == COLLADAFW::Transformation::ROTATE) { if (curves.size() != 1) { - fprintf(stderr, "expected 1 curve, got %u\n", curves.size()); + fprintf(stderr, "expected 1 curve, got %lu\n", (unsigned long)curves.size()); return false; } @@ -924,9 +924,9 @@ if ((!is_xyz && curves.size() != 1) || (is_xyz && curves.size() != 3)) { if (is_xyz) - fprintf(stderr, "%s: expected 3 curves, got %u\n", path, curves.size()); + fprintf(stderr, "%s: expected 3 curves, got %lu\n", path, (unsigned long)curves.size()); else - fprintf(stderr, "%s: expected 1 curve, got %u\n", path, curves.size()); + fprintf(stderr, "%s: expected 1 curve, got %lu\n", path, (unsigned long)curves.size()); return false; } @@ -953,7 +953,7 @@ else if (type == COLLADAFW::Transformation::MATRIX) { // for now, of matrix animation, support only the case when all values are packed into one animation if (curves.size() != 16) { - fprintf(stderr, "%s: expected 16 curves, got %u\n", path, curves.size()); + fprintf(stderr, "%s: expected 16 curves, got %lu\n", path, (unsigned long)curves.size()); return false; } Index: source/blender/collada/MeshImporter.h =================================================================== --- source/blender/collada/MeshImporter.h (revision 32858) +++ source/blender/collada/MeshImporter.h (working copy) @@ -72,6 +72,8 @@ { private: + UnitConverter *unitconverter; + Scene *scene; ArmatureImporter *armature_importer; @@ -120,8 +122,6 @@ bool flat_face(unsigned int *nind, COLLADAFW::MeshVertexData& nor, int count); - UnitConverter *unitconverter; - public: MeshImporter(UnitConverter *unitconv, ArmatureImporter *arm, Scene *sce); Index: source/blender/windowmanager/intern/wm_operators.c =================================================================== --- source/blender/windowmanager/intern/wm_operators.c (revision 32858) +++ source/blender/windowmanager/intern/wm_operators.c (working copy) @@ -1929,6 +1929,7 @@ RNA_string_set(op->ptr, "filepath", filepath); } + event = NULL; /* XXX @TDOD FIXME UNUSED this is just to shutup gcc */ WM_event_add_fileselect(C, op); return OPERATOR_RUNNING_MODAL;