Changeset 11795 for code/branches/cegui0.8_ogre1.9/src/orxonox/controllers

Timestamp:

Feb 21, 2018, 12:03:52 AM (7 years ago)

Author:

landauf

Message:

merged ogre1.9 (including cegui0.8) into new branch

Location:

code/branches/cegui0.8_ogre1.9

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/NewHumanController.cc (modified) (1 diff)

code/branches/cegui0.8_ogre1.9/src/orxonox/controllers/NewHumanController.cc

@@ -397 +397 @@
                 try
                 {
-                    wePtr = orxonox_cast<WorldEntity*>(Ogre::any_cast<OrxonoxClass*>(itr->movable->getUserAny()));
+#if OGRE_VERSION >= 0x010900
+                    const Ogre::Any& any = itr->movable->getUserObjectBindings().getUserAny();
+#else
+                    const Ogre::Any& any = itr->movable->getUserAny();
+#endif
+                    wePtr = orxonox_cast<WorldEntity*>(Ogre::any_cast<OrxonoxClass*>(any));
                 }
                 catch (...)