From 21a0a222b85cf71ce4e6a01d104c27cdec8e8e07 Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Sun, 8 Jul 2012 01:32:29 +0000 Subject: [PATCH] - apply https://github.com/assimp/assimp/pull/5 git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1273 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- .../SimpleTexturedOpenGL/src/model_loading.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp index 66e44250c..83d47795f 100644 --- a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp +++ b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp @@ -410,7 +410,9 @@ void recursive_render (const struct aiScene *sc, const struct aiNode* nd, float unsigned int n=0, t; aiMatrix4x4 m = nd->mTransformation; - m.Scaling(aiVector3D(scale, scale, scale), m); + aiMatrix4x4 m2; + aiMatrix4x4::Scaling(aiVector3D(scale, scale, scale), m2); + m = m * m2; // update transform m.Transpose();