From 76afbc9bcfa5ed1e86de2865bbec416f55740cef Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 27 Mar 2017 20:30:14 +0100 Subject: [PATCH] Fixed ac plugin's handling of rot primitive in .ac files --- CMakeLists.txt | 2 +- src/osgPlugins/ac/ac3d.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3813ba715..8e9001fd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,7 +116,7 @@ PROJECT(OpenSceneGraph) SET(OPENSCENEGRAPH_MAJOR_VERSION 3) SET(OPENSCENEGRAPH_MINOR_VERSION 5) SET(OPENSCENEGRAPH_PATCH_VERSION 6) -SET(OPENSCENEGRAPH_SOVERSION 146) +SET(OPENSCENEGRAPH_SOVERSION 147) # set to 0 when not a release candidate, non zero means that any generated # git tags will be treated as release candidates of given number diff --git a/src/osgPlugins/ac/ac3d.cpp b/src/osgPlugins/ac/ac3d.cpp index 19dcb6158..3f38a6a5a 100644 --- a/src/osgPlugins/ac/ac3d.cpp +++ b/src/osgPlugins/ac/ac3d.cpp @@ -1242,7 +1242,11 @@ readObject(std::istream& stream, FileData& fileData, const osg::Matrix& parentTr else if (token == "rot") { for (unsigned n = 0; n < 3; ++n) for (unsigned m = 0; m < 3; ++m) +#if 1 + stream >> transform(n, m); +#else stream >> transform(m, n); +#endif } else if (token == "loc") { for (unsigned n = 0; n < 3; ++n)