Commit ed07c7a6 authored by Jussi Lindgren's avatar Jussi Lindgren

Merge branch 'integration-1.2' of...

Merge branch 'integration-1.2' of git+ssh://scm.gforge.inria.fr//gitroot/openvibe/openvibe into wip-jlindgre-debug-baddrawable
parents 9da0373a 50318007
...@@ -1443,7 +1443,7 @@ Ogre::String DotSceneLoader::getProperty(const Ogre::String &ndNm, const Ogre::S ...@@ -1443,7 +1443,7 @@ Ogre::String DotSceneLoader::getProperty(const Ogre::String &ndNm, const Ogre::S
void DotSceneLoader::processUserDataReference(rapidxml::xml_node<>* XMLNode, Ogre::Entity *pEntity) void DotSceneLoader::processUserDataReference(rapidxml::xml_node<>* XMLNode, Ogre::Entity *pEntity)
{ {
Ogre::String str = XMLNode->first_attribute("id")->value(); Ogre::String str = XMLNode->first_attribute("id")->value();
pEntity->setUserAny(Ogre::Any(str)); pEntity->getUserObjectBindings().setUserAny(Ogre::Any(str));
} }
#endif #endif
\ No newline at end of file
...@@ -9,6 +9,9 @@ int main() ...@@ -9,6 +9,9 @@ int main()
CTagStream tagStream1; CTagStream tagStream1;
#ifdef _WIN32
ok=true;
#else
try { try {
// The construction of the second TagStream must fail because of port already in use. // The construction of the second TagStream must fail because of port already in use.
CTagStream tagStream2; CTagStream tagStream2;
...@@ -16,6 +19,7 @@ int main() ...@@ -16,6 +19,7 @@ int main()
catch( std::exception& ) { catch( std::exception& ) {
ok=true; ok=true;
} }
#endif
// The construction must succeed because another port is used. // The construction must succeed because another port is used.
CTagStream tagStream3(15362); CTagStream tagStream3(15362);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment