Changeset 7221 in orxonox.OLD for trunk/src/world_entities/elements/image_entity.cc

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/world_entities/elements/image_entity.cc (modified) (1 diff)

trunk/src/world_entities/elements/image_entity.cc

@@ -106 +106 @@
  * @param textureFile The texture-file to load onto the crosshair
  */
-void ImageEntity::setTexture(const char* textureFile)
+void ImageEntity::setTexture(const std::string& textureFile)
 {
   this->material->setDiffuseMap(textureFile);