Changeset 7221 in orxonox.OLD for trunk/src/lib/particles/sprite_particles.cc

Timestamp:

Mar 15, 2006, 3:10:45 PM (18 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/lib/particles/sprite_particles.cc (modified) (1 diff)

trunk/src/lib/particles/sprite_particles.cc

@@ -89 +89 @@
  * @param textureFile the Texture to load onto these SpriteParticles
  */
-void SpriteParticles::setMaterialTexture(const char* textureFile)
+void SpriteParticles::setMaterialTexture(const std::string& textureFile)
 {
   this->material.setDiffuseMap(textureFile);