sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Image: fix mipmap generation flags not properly being updated

Browse Source
This commit is contained in:
Kirill Vainer 2015-04-24 23:35:30 -04:00
parent 9ba04bed8f
commit 73f53931f0
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jme3-core/src/main/java/com/jme3/texture/Image.java
View File

@ -421,7 +421,8 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ {
/** /**
* @return True if the image needs to have mipmaps generated * @return True if the image needs to have mipmaps generated
* for it (as requested by the texture). * for it (as requested by the texture). This stays true even
* after mipmaps have been generated.
*/ */
public boolean isGeneratedMipmapsRequired() { public boolean isGeneratedMipmapsRequired() {
return needGeneratedMips; return needGeneratedMips;
@ -434,8 +435,9 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ {
@Override @Override
public void setUpdateNeeded() { public void setUpdateNeeded() {
super.setUpdateNeeded(); super.setUpdateNeeded();
if (!isGeneratedMipmapsRequired() && !hasMipmaps()) { if (isGeneratedMipmapsRequired() && !hasMipmaps()) {
setNeedGeneratedMipmaps(); // Mipmaps are no longer valid, since the image was changed.
setMipmapsGenerated(false);
} }
} }
@ -527,11 +529,13 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ {
this(); this();
if (mipMapSizes != null && mipMapSizes.length <= 1) { if (mipMapSizes != null) {
mipMapSizes = null; if (mipMapSizes.length <= 1) {
} else { mipMapSizes = null;
needGeneratedMips = false; } else {
mipsWereGenerated = true; needGeneratedMips = false;
mipsWereGenerated = true;
}
} }
setFormat(format); setFormat(format);