From 5d861a825020d8292768ca6cc392d993fea54f79 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Thu, 31 Jul 2014 15:09:49 +0200 Subject: [PATCH] bugfix: - fix gcc-specific compiler warnings. --- code/OgreBinarySerializer.cpp | 1 - code/OgreBinarySerializer.h | 2 +- code/OgreStructs.cpp | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/OgreBinarySerializer.cpp b/code/OgreBinarySerializer.cpp index 6674f4cee..155e889d5 100644 --- a/code/OgreBinarySerializer.cpp +++ b/code/OgreBinarySerializer.cpp @@ -534,7 +534,6 @@ void OgreBinarySerializer::ReadSubMeshTextureAlias(SubMesh *submesh) void OgreBinarySerializer::ReadSubMeshNames(Mesh *mesh) { uint16_t id = 0; - uint16_t submeshIndex = 0; if (!AtEnd()) { diff --git a/code/OgreBinarySerializer.h b/code/OgreBinarySerializer.h index 69db4b722..8b4e3ccfe 100644 --- a/code/OgreBinarySerializer.h +++ b/code/OgreBinarySerializer.h @@ -75,8 +75,8 @@ private: }; OgreBinarySerializer(MemoryStreamReader *reader, AssetMode mode) : - m_reader(reader), m_currentLen(0), + m_reader(reader), assetMode(mode) { } diff --git a/code/OgreStructs.cpp b/code/OgreStructs.cpp index 3eaf2df01..6311d0b6c 100644 --- a/code/OgreStructs.cpp +++ b/code/OgreStructs.cpp @@ -963,6 +963,8 @@ aiAnimation *Animation::ConvertToAssimpAnimation() // Skeleton Skeleton::Skeleton() : + bones(), + animations(), blendMode(ANIMBLEND_AVERAGE) { }