From 4fdce777b5c91cdcbab9ff128c9c602a34cc75f7 Mon Sep 17 00:00:00 2001 From: shadowislord Date: Sat, 28 Jun 2014 20:02:25 -0400 Subject: [PATCH] * Fix ParticleEmitter.control reference which became incorrect after cloning --- .../src/main/java/com/jme3/effect/ParticleEmitter.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jme3-core/src/main/java/com/jme3/effect/ParticleEmitter.java b/jme3-core/src/main/java/com/jme3/effect/ParticleEmitter.java index 3db67a1a5..28bfd595d 100644 --- a/jme3-core/src/main/java/com/jme3/effect/ParticleEmitter.java +++ b/jme3-core/src/main/java/com/jme3/effect/ParticleEmitter.java @@ -167,11 +167,12 @@ public class ParticleEmitter extends Geometry { clone.endColor = endColor.clone(); clone.particleInfluencer = particleInfluencer.clone(); - // remove wrong control - clone.controls.remove(control); + // remove original control from the clone + clone.controls.remove(this.control); - // put correct control - clone.controls.add(new ParticleEmitterControl(clone)); + // put clone's control in + clone.control = new ParticleEmitterControl(clone); + clone.controls.add(clone.control); // Reinitialize particle mesh switch (meshType) {