From 98ef47c1c9012e7592eb6ac72f5513cafb283b40 Mon Sep 17 00:00:00 2001
From: hybrid <hybrid@dfc29bdd-3216-0410-991c-e03cc46cb475>
Date: Tue, 10 Nov 2009 14:46:03 +0000
Subject: [PATCH] Make scale value optional in keyframes as well.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2830 dfc29bdd-3216-0410-991c-e03cc46cb475
---
 source/Irrlicht/COgreMeshFileLoader.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/source/Irrlicht/COgreMeshFileLoader.cpp b/source/Irrlicht/COgreMeshFileLoader.cpp
index c427a54b..b9044b9f 100644
--- a/source/Irrlicht/COgreMeshFileLoader.cpp
+++ b/source/Irrlicht/COgreMeshFileLoader.cpp
@@ -23,6 +23,8 @@ namespace irr
 namespace scene
 {
 
+namespace
+{
 	enum OGRE_CHUNKS
 	{
 		// Main Chunks
@@ -58,6 +60,7 @@ namespace scene
 		COGRE_GEOMETRY_VERTEX_BUFFER= 0x5200,
 		COGRE_GEOMETRY_VERTEX_BUFFER_DATA= 0x5210
 	};
+}
 
 //! Constructor
 COgreMeshFileLoader::COgreMeshFileLoader(io::IFileSystem* fs, video::IVideoDriver* driver)
@@ -1422,8 +1425,13 @@ bool COgreMeshFileLoader::loadSkeleton(io::IReadFile* meshFile, const core::stri
 				keyframe.Time+=animationTotal;
 				readVector(file, data, keyframe.Position);
 				readQuaternion(file, data, keyframe.Orientation);
-				readVector(file, data, keyframe.Scale);
-				keyframe.Scale *= 1.f;
+				if (data.read<data.header.length)
+				{
+					readVector(file, data, keyframe.Scale);
+					keyframe.Scale.X *= -1.f;
+				}
+				else
+					keyframe.Scale=core::vector3df(1,1,1);
 				keyframe.BoneID=bone;
 #ifdef IRR_OGRE_LOADER_DEBUG
 //				os::Printer::log("Keyframe time", core::stringc(keyframe.Time));