Changeset 7221 in orxonox.OLD for trunk/src/lib/particles/dot_particles.h

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/dot_particles.h (modified) (1 diff)

trunk/src/lib/particles/dot_particles.h

@@ -21 +21 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  void setMaterialTexture(const char* textureFile);
+  void setMaterialTexture(const std::string& textureFile);
 
   /** @returns the Material that lies on this particles */