Changeset 1263 for code/branches/merge/src/core/CoreIncludes.h

Timestamp:

May 13, 2008, 3:45:19 PM (17 years ago)

Author:

rgrieder

Message:

• merged ogre branch into merge branch

File:

• code/branches/merge/src/core/CoreIncludes.h (modified) (1 diff)

code/branches/merge/src/core/CoreIncludes.h

@@ -59 +59 @@
     if (orxonox::Identifier::isCreatingHierarchy() && this->getParents()) \
         this->getParents()->insert(this->getParents()->end(), this->getIdentifier()); \
-    orxonox::ClassManager<ClassName>::getIdentifier()->addObject(this)
+    orxonox::ClassManager<ClassName>::getIdentifier()->addObject(this); \
+    if (orxonox::Identifier::isCreatingHierarchy()) \
+      return
 
 /**