From: Jakob MG <jakob_mg@hotmail.com>
Date: Thu, 16 Jun 2011 15:14:52 +0000 (+0200)
Subject: Merge remote branch 'origin/cbrutail/treeleavesfix'
X-Git-Tag: xonotic-v0.5.0~98^2~7
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=7c46645baafc45555829847275aaa6458d2bb7a4;hp=7952e74e951e659a1721bc8e2ddff421947132f8

Merge remote branch 'origin/cbrutail/treeleavesfix'
---

diff --git a/models/leaves6.tga b/models/leaves6.tga
index dba586d5..9d231f70 100644
Binary files a/models/leaves6.tga and b/models/leaves6.tga differ
diff --git a/models/leaves7.tga b/models/leaves7.tga
index 6a620268..f4756a87 100644
Binary files a/models/leaves7.tga and b/models/leaves7.tga differ
diff --git a/scripts/model_tree.shader b/scripts/model_tree.shader
index 261881a2..05f9e977 100644
--- a/scripts/model_tree.shader
+++ b/scripts/model_tree.shader
@@ -29,7 +29,7 @@ cull none
        deformVertexes wave 128 sin 0 1 0 0.4 
        {
                map models/leaves6.tga
-               alphaFunc GT0
+               blendFunc blend
                rgbGen vertex
        }
 }
@@ -46,7 +46,7 @@ cull none
        deformVertexes wave 128 sin 0 1 0 0.5
        {
                map models/leaves7.tga
-               alphaFunc GT0
+               blendFunc blend
                rgbGen vertex
        }
 }