- 3.0.7 fix for merge issue

git-svn-id: https://jmonkeyengine.googlecode.com/svn/branches/3.0final@11115 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
3.0
nor..67 11 years ago
parent cacd179107
commit a77c090be2
  1. 2
      engine/src/core/com/jme3/system/JmeVersion.java
  2. 6
      engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglRenderer.java
  3. 2
      sdk/nbproject/project.properties

@ -32,5 +32,5 @@
package com.jme3.system; package com.jme3.system;
public class JmeVersion { public class JmeVersion {
public static final String FULL_NAME = "jMonkeyEngine 3.0.6"; public static final String FULL_NAME = "jMonkeyEngine 3.0.7";
} }

@ -490,10 +490,10 @@ public class LwjglRenderer implements Renderer {
context.depthTestEnabled = false; context.depthTestEnabled = false;
} }
if (state.isAlphaTest() && context.alphaTestFallOff == 0) { if (state.isAlphaTest() && !context.alphaTestEnabled) {
glEnable(GL_ALPHA_TEST); glEnable(GL_ALPHA_TEST);
glAlphaFunc(GL_GREATER, state.getAlphaFallOff()); glAlphaFunc(GL_GREATER, context.alphaTestFallOff);
context.alphaTestFallOff = state.getAlphaFallOff(); context.alphaTestEnabled = true;
} else if (!state.isAlphaTest() && context.alphaTestEnabled) { } else if (!state.isAlphaTest() && context.alphaTestEnabled) {
glDisable(GL_ALPHA_TEST); glDisable(GL_ALPHA_TEST);
context.alphaTestEnabled = false; context.alphaTestEnabled = false;

@ -6,7 +6,7 @@ app.icon.icns=jmonkeyplatform.icns
#version name used for application and settings folder, no spaces! #version name used for application and settings folder, no spaces!
app.version=3.0 app.version=3.0
#version number used for plugins, only 3 numbers (e.g. 3.1.3) #version number used for plugins, only 3 numbers (e.g. 3.1.3)
plugins.version=3.0.6 plugins.version=3.0.7
#used netbeans platform #used netbeans platform
netbeans.platform.url=http://download.netbeans.org/netbeans/7.3.1/final/zip/netbeans-7.3.1-201306052037-javase.zip netbeans.platform.url=http://download.netbeans.org/netbeans/7.3.1/final/zip/netbeans-7.3.1-201306052037-javase.zip
#command line args #command line args

Loading…
Cancel
Save