Changeset 12020 for code/branches/PresentationFS18/src/orxonox

Timestamp:

May 30, 2018, 2:56:24 PM (7 years ago)

Author:

patricwi

Message:

Merged Masterserver

Location:

code/branches/PresentationFS18

Files:

• . (modified) (1 prop)
• src/orxonox/graphics/Model.cc (modified) (2 diffs)

code/branches/PresentationFS18/src/orxonox/graphics/Model.cc

@@ -104 +104 @@
         registerVariable(this->meshSrc_,    VariableDirection::ToClient, new NetworkCallback<Model>(this, &Model::changedMesh));
         registerVariable(this->renderQueueGroup_,    VariableDirection::ToClient, new NetworkCallback<Model>(this, &Model::changedRenderQueueGroup));
-        registerVariable(this->materialName_,    VariableDirection::ToClient, new NetworkCallback<Model>(this, &Model::changedMaterial));
+        //Commented out, since this causes texture load failures on client side
+        //registerVariable(this->materialName_,    VariableDirection::ToClient, new NetworkCallback<Model>(this, &Model::changedMaterial));
         registerVariable(this->bCastShadows_, VariableDirection::ToClient, new NetworkCallback<Model>(this, &Model::changedShadows));
     }
@@ -125 +126 @@
                 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())