[Orxonox-commit 7313] r11930 - code/branches/Masterserver_FS18/src/orxonox/graphics

[mdedial at orxonox.net]

Author: mdedial
Date: 2018-05-03 14:47:26 +0200 (Thu, 03 May 2018)
New Revision: 11930

Modified:
   code/branches/Masterserver_FS18/src/orxonox/graphics/Model.cc
Log:
Fix a bug that was trying to load mesh files with empty filenames.


Modified: code/branches/Masterserver_FS18/src/orxonox/graphics/Model.cc
===================================================================
--- code/branches/Masterserver_FS18/src/orxonox/graphics/Model.cc	2018-05-03 11:48:27 UTC (rev 11929)
+++ code/branches/Masterserver_FS18/src/orxonox/graphics/Model.cc	2018-05-03 12:47:26 UTC (rev 11930)
@@ -125,7 +125,9 @@
             if (this->mesh_.getEntity())
                 this->detachOgreObject(this->mesh_.getEntity());
 
-            this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
+                // Refuse to set empty mesh sources
+                if (this->meshSrc_ != "")
+                    this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
 
             if (this->mesh_.getEntity())
             {