Merge branch 'master' of https://github.com/libgdx/libgdx

[mikumikustudio/libgdx-mikumikustudio.git] / gdx / src / com / badlogic / gdx / graphics / g2d / ParticleEffect.java

diff --git a/gdx/src/com/badlogic/gdx/graphics/g2d/ParticleEffect.java b/gdx/src/com/badlogic/gdx/graphics/g2d/ParticleEffect.java
index c093377..3c29c99 100644 (file)
--- a/gdx/src/com/badlogic/gdx/graphics/g2d/ParticleEffect.java
+++ b/gdx/src/com/badlogic/gdx/graphics/g2d/ParticleEffect.java
@@ -37,6 +37,7 @@ import com.badlogic.gdx.utils.StreamUtils;
 public class ParticleEffect implements Disposable {\r
        private final Array<ParticleEmitter> emitters;\r
        private BoundingBox bounds;\r
+       private boolean ownsTexture;\r
 \r
        public ParticleEffect () {\r
                emitters = new Array(8);\r
@@ -188,6 +189,7 @@ public class ParticleEffect implements Disposable {
        }\r
 \r
        public void loadEmitterImages (FileHandle imagesDir) {\r
+               ownsTexture = true;\r
                for (int i = 0, n = emitters.size; i < n; i++) {\r
                        ParticleEmitter emitter = emitters.get(i);\r
                        String imagePath = emitter.getImagePath();\r
@@ -203,6 +205,7 @@ public class ParticleEffect implements Disposable {
 \r
        /** Disposes the texture for each sprite for each ParticleEmitter. */\r
        public void dispose () {\r
+               if (!ownsTexture) return;\r
                for (int i = 0, n = emitters.size; i < n; i++) {\r
                        ParticleEmitter emitter = emitters.get(i);\r
                        emitter.getSprite().getTexture().dispose();\r