From bc1d195613d085ebc7cf91f26754cf8be5eb5755 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Fri, 22 Mar 2002 19:24:11 +0000
Subject: [PATCH] fix GeomParticles

---
 .../src/particlesystem/geomParticleRenderer.I |  1 +
 .../particlesystem/geomParticleRenderer.cxx   | 24 ++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/panda/src/particlesystem/geomParticleRenderer.I b/panda/src/particlesystem/geomParticleRenderer.I
index c290348ad2..00c47efc00 100644
--- a/panda/src/particlesystem/geomParticleRenderer.I
+++ b/panda/src/particlesystem/geomParticleRenderer.I
@@ -28,6 +28,7 @@
 
 INLINE void GeomParticleRenderer::
 set_geom_node(PandaNode *node) {
+  nassertv(node != (PandaNode *)NULL);
   _geom_node = node;
   resize_pool(_pool_size);
 }
diff --git a/panda/src/particlesystem/geomParticleRenderer.cxx b/panda/src/particlesystem/geomParticleRenderer.cxx
index 87c01cbf90..dbbd95cf88 100644
--- a/panda/src/particlesystem/geomParticleRenderer.cxx
+++ b/panda/src/particlesystem/geomParticleRenderer.cxx
@@ -129,11 +129,12 @@ kill_nodes(void) {
 
 void GeomParticleRenderer::
 birth_particle(int index) {
-  nassertv(_node_vector[index] == (PandaNode *)NULL);
-  PandaNode *node = new PandaNode("");
-  get_render_node()->add_child(node);
-  node->add_child(_geom_node);
-  _node_vector[index] = node;
+  if (_node_vector[index] == (PandaNode *)NULL) {
+    PandaNode *node = new PandaNode("");
+    get_render_node()->add_child(node);
+    node->add_child(_geom_node);
+    _node_vector[index] = node;
+  }
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -144,8 +145,10 @@ birth_particle(int index) {
 
 void GeomParticleRenderer::
 kill_particle(int index) {
-  get_render_node()->remove_child(_node_vector[index]);
-  _node_vector[index] = (PandaNode *)NULL;
+  if (_node_vector[index] != (PandaNode *)NULL) {
+    get_render_node()->remove_child(_node_vector[index]);
+    _node_vector[index] = (PandaNode *)NULL;
+  }
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -170,8 +173,13 @@ render(pvector< PT(PhysicsObject) >& po_vector, int ttl_particles) {
     cur_particle = (BaseParticle *) po_vector[i].p();
     cur_node = *cur_node_iter;
 
-    if (cur_particle->get_alive() == true) {
+    if (cur_particle->get_alive()) {
       // living particle
+      if (cur_node == (PandaNode *)NULL) {
+        birth_particle(i);
+        cur_node = *cur_node_iter;
+      }
+      nassertv(cur_node != (PandaNode *)NULL);
 
       pos = cur_particle->get_position();