From: Mario <zacjardine@y7mail.com>
Date: Tue, 10 Oct 2017 07:16:27 +0000 (+0000)
Subject: Merge branch 'matthiaskrgr/nadecountdown_nopicmip' into 'master'
X-Git-Tag: xonotic-v0.8.5~2454
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=05776c4204bf73c8ebc84e615ad088af45ebe5ed;hp=34f177fc2f2d9b553f36ae37d1f6d46ab3603e29

Merge branch 'matthiaskrgr/nadecountdown_nopicmip' into 'master'

shaders: mark nade countdown texture with nopicmip keyword

See merge request xonotic/xonotic-data.pk3dir!465
---

diff --git a/scripts/ok_nade_counter.shader b/scripts/ok_nade_counter.shader
index a538eafbb5..bfd9808fbb 100644
--- a/scripts/ok_nade_counter.shader
+++ b/scripts/ok_nade_counter.shader
@@ -2,6 +2,7 @@ models/ok_nade_counter/ok_nade_counter_01
 {
 	dpnoshadow
 	deformVertexes autosprite
+	nopicmip
 	{
 		map "models/ok_nade_counter/ok_nade_counter_01"
 		blendfunc add
@@ -11,6 +12,7 @@ models/ok_nade_counter/ok_nade_counter_02
 {
 	dpnoshadow
 	deformVertexes autosprite
+	nopicmip
 	{
 		map "models/ok_nade_counter/ok_nade_counter_02"
 		blendfunc add
@@ -20,6 +22,7 @@ models/ok_nade_counter/ok_nade_counter_03
 {
 	dpnoshadow
 	deformVertexes autosprite
+	nopicmip
 	{
 		map "models/ok_nade_counter/ok_nade_counter_03"
 		blendfunc add
@@ -29,6 +32,7 @@ models/ok_nade_counter/ok_nade_counter_04
 {
 	dpnoshadow
 	deformVertexes autosprite
+	nopicmip
 	{
 		map "models/ok_nade_counter/ok_nade_counter_04"
 		blendfunc add
@@ -38,6 +42,7 @@ models/ok_nade_counter/ok_nade_counter_05
 {
 	dpnoshadow
 	deformVertexes autosprite
+	nopicmip
 	{
 		map "models/ok_nade_counter/ok_nade_counter_05"
 		blendfunc add
@@ -47,6 +52,7 @@ models/ok_nade_counter/ok_nade_counter_06
 {
 	dpnoshadow
 	deformVertexes autosprite
+	nopicmip
 	{
 		map "models/ok_nade_counter/ok_nade_counter_06"
 		blendfunc add
@@ -56,6 +62,7 @@ models/ok_nade_counter/ok_nade_counter_07
 {
 	dpnoshadow
 	deformVertexes autosprite
+	nopicmip
 	{
 		map "models/ok_nade_counter/ok_nade_counter_07"
 		blendfunc add
@@ -65,6 +72,7 @@ models/ok_nade_counter/ok_nade_counter_08
 {
 	dpnoshadow
 	deformVertexes autosprite
+	nopicmip
 	{
 		map "models/ok_nade_counter/ok_nade_counter_08"
 		blendfunc add
@@ -74,6 +82,7 @@ models/ok_nade_counter/ok_nade_counter_09
 {
 	dpnoshadow
 	deformVertexes autosprite
+	nopicmip
 	{
 		map "models/ok_nade_counter/ok_nade_counter_09"
 		blendfunc add