Changeset 631 for code/branches/FICN

Timestamp:

Dec 19, 2007, 12:25:13 AM (17 years ago)

Author:

scheusso

Message:

removed segfault

Location:

code/branches/FICN/src/orxonox/objects

Files:

• Model.cc (modified) (2 diffs)
• WorldEntity.cc (modified) (2 diffs)

code/branches/FICN/src/orxonox/objects/Model.cc

@@ -15 +15 @@
     {
         RegisterObject(Model);
-        registerAllVariables();
     }
 
@@ -30 +29 @@
             meshSrc_ = xmlElem->Attribute("mesh");
         }
+        create();
     }
     
     bool Model::create(){
-      this->mesh_.setMesh(meshSrc_);
-      this->attachObject(this->mesh_.getEntity());
-
-      COUT(4) << "Loader: Created model" << std::endl;
+      if(meshSrc_.compare("")!=0){
+        this->mesh_.setMesh(meshSrc_);
+        this->attachObject(this->mesh_.getEntity());
+        COUT(4) << "Loader: Created model" << std::endl;
+      }
+      registerAllVariables();
       return true;
     }

code/branches/FICN/src/orxonox/objects/WorldEntity.cc

@@ -46 +46 @@
         RegisterObject(WorldEntity);
 
-        registerAllVariables();
         if (Orxonox::getSingleton()->getSceneManager())
         {
@@ -157 +156 @@
 
     bool WorldEntity::create(){
+      registerAllVariables();
       return true;
     }