fix another merge error

jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java

@@ -2203,7 +2203,8 @@ public final class GLRenderer implements Renderer {
                     // For OpenGL3 and up.
                     // We'll generate mipmaps via glGenerateMipmapEXT (see below)
                 }
-            } else if (img.hasMipmaps()) {
+            } else if (caps.contains(Caps.OpenGL20)) {
+                if (img.hasMipmaps()) {
                     // Image already has mipmaps, set the max level based on the 
                     // number of mipmaps we have.
                     gl.glTexParameteri(target, GL2.GL_TEXTURE_MAX_LEVEL, img.getMipMapSizes().length - 1);
@@ -2212,6 +2213,7 @@ public final class GLRenderer implements Renderer {
                     // Specify that that the texture has no mipmaps.
                     gl.glTexParameteri(target, GL2.GL_TEXTURE_MAX_LEVEL, 0);
                 }
+            }
         } else {
             // Check if graphics card doesn't support multisample textures
             if (!caps.contains(Caps.TextureMultisample)) {