From cacd1791078d70ab63d593a48add0fa8f50f9ea2 Mon Sep 17 00:00:00 2001
From: "nor..67" <normen667@gmail.com>
Date: Tue, 25 Mar 2014 02:37:15 +0000
Subject: [PATCH] - re-fix leftover merge conflict

git-svn-id: https://jmonkeyengine.googlecode.com/svn/branches/3.0final@11114 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 .../com/jme3/renderer/lwjgl/LwjglRenderer.java     | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglRenderer.java b/engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglRenderer.java
index b19753a90..e63b1b6d8 100644
--- a/engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglRenderer.java
+++ b/engine/src/lwjgl/com/jme3/renderer/lwjgl/LwjglRenderer.java
@@ -490,23 +490,19 @@ public class LwjglRenderer implements Renderer {
             context.depthTestEnabled = false;
         }
 
-        if (state.isAlphaTest() && !context.alphaTestEnabled) {
+        if (state.isAlphaTest() && context.alphaTestFallOff == 0) {
             glEnable(GL_ALPHA_TEST);
-            glAlphaFunc(convertTestFunction(context.alphaFunc), context.alphaTestFallOff);
-            context.alphaTestEnabled = true;
+            glAlphaFunc(GL_GREATER, state.getAlphaFallOff());
+            context.alphaTestFallOff = state.getAlphaFallOff();
         } else if (!state.isAlphaTest() && context.alphaTestEnabled) {
             glDisable(GL_ALPHA_TEST);
             context.alphaTestEnabled = false;
         }
         if (state.getAlphaFallOff() != context.alphaTestFallOff) {
-            glAlphaFunc(convertTestFunction(context.alphaFunc), context.alphaTestFallOff);   
+            glAlphaFunc(GL_GREATER, context.alphaTestFallOff);   
             context.alphaTestFallOff = state.getAlphaFallOff();
-        }         
-        if (state.getAlphaFunc() != context.alphaFunc) {
-            glAlphaFunc(convertTestFunction(state.getAlphaFunc()), context.alphaTestFallOff);
-            context.alphaFunc = state.getAlphaFunc();
         }
-
+        
         if (state.isDepthWrite() && !context.depthWriteEnabled) {
             glDepthMask(true);
             context.depthWriteEnabled = true;