Fixed ac plugin's handling of rot primitive in .ac files

This commit is contained in:
Robert Osfield
2017-03-27 20:30:14 +01:00
parent 70e7cb886b
commit 76afbc9bcf
2 changed files with 5 additions and 1 deletions

View File

@@ -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

View File

@@ -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)