Changeset 5929 for code/trunk/src/orxonox/graphics/ParticleEmitter.cc

Timestamp:

Oct 12, 2009, 8:20:07 PM (16 years ago)

Author:

rgrieder

Message:

Merged core5 branch back to the trunk.
Key features include clean level unloading and an extended XML event system.

Two important notes:
Delete your keybindings.ini files! * or you will still get parser errors when loading the key bindings.
Delete build_dir/lib/modules/libgamestates.module! * or orxonox won't start.
Best thing to do is to delete the build folder

Location:

code/trunk

Files:

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

code/trunk/src/orxonox/graphics/ParticleEmitter.cc

@@ -63 +63 @@
         {
             this->detachOgreObject(this->particles_->getParticleSystem());
-            delete this->particles_;
+            this->particles_->destroy();
         }
     }
@@ -101 +101 @@
         if (this->particles_)
         {
-            delete this->particles_;
+            this->particles_->destroy();
             this->particles_ = 0;
         }