Changeset 9406 in orxonox.OLD for trunk/src/lib/particles/model_particles.cc

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/src/lib/particles/model_particles.cc (modified) (2 diffs)

trunk/src/lib/particles/model_particles.cc

@@ -33 +33 @@
 ->defaultValues("maps/evil-flower.png");
 
-using namespace std;
+
 
 /**
@@ -136 +136 @@
     }
   else
-    PRINTF(2)("no model loaded onto ParticleSystem-%s\n", this->getName());
+    PRINTF(2)("no model loaded onto ParticleSystem-%s\n", this->getCName());
   glPopAttrib();
 }