- 3.0.7 fix for merge issue

git-svn-id: https://jmonkeyengine.googlecode.com/svn/branches/3.0final@11115 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

engine/src/core/com/jme3/system/JmeVersion.java

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

engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglRenderer.java

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

sdk/nbproject/project.properties

@@ -6,7 +6,7 @@ app.icon.icns=jmonkeyplatform.icns
 #version name used for application and settings folder, no spaces!
 app.version=3.0
 #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
 netbeans.platform.url=http://download.netbeans.org/netbeans/7.3.1/final/zip/netbeans-7.3.1-201306052037-javase.zip
 #command line args