Merge branch 'master' of github.com:jMonkeyEngine/jmonkeyengine

jme3-core/src/main/java/com/jme3/effect/ParticleEmitter.java

@@ -868,6 +868,13 @@ public class ParticleEmitter extends Geometry {
      * which are currently inactive will be spawned immediately.
      */
     public void emitAllParticles() {
+        emitParticles(particles.length);
+    }
+
+    /**
+     * Instantly emits available particles, up to num.
+     */
+    public void emitParticles(int num) {
         // Force world transform to update
         this.getWorldTransform();
 
@@ -888,7 +895,9 @@ public class ParticleEmitter extends Geometry {
             max.set(Vector3f.NEGATIVE_INFINITY);
         }
 
-        while (emitParticle(min, max) != null);
+        for(int i=0;i<num;i++) {
+            if( emitParticle(min, max) == null ) break;
+        }
 
         bbox.setMinMax(min, max);
         this.setBoundRefresh();

jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/TextureUtil.java

@@ -346,7 +346,7 @@ class TextureUtil {
                     // or upload slice
                     if (index == -1){
                         GL12.glTexImage3D(target,
-                                          0,
+                                          i,
                                           glFmt.internalFormat,
                                           mipWidth,
                                           mipHeight,