projects
/
xonotic
/
darkplaces.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2579f60
)
also set TEXF_ALPHA on GL_ONE GL_ONE (don't ask)
author
divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 2 Sep 2011 20:24:31 +0000
(20:24 +0000)
committer
Rudolf Polzer <divverent@xonotic.org>
Sat, 3 Sep 2011 15:00:55 +0000
(17:00 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11320
d7cf8633
-e32d-0410-b094-
e92efae38249
::stable-branch::merge=
4b0862a70a700cdd8a33e8163dbc9d7fe597e3ce
model_shared.c
patch
|
blob
|
history
diff --git
a/model_shared.c
b/model_shared.c
index 40e7b278512194b6dd8d3957ee061e9499e29d2e..dc6e798e366d542c970434d0f5664c8e564d0532 100644
(file)
--- a/
model_shared.c
+++ b/
model_shared.c
@@
-1987,6
+1987,11
@@
void Mod_LoadQ3Shaders(void)
layer->texflags |= TEXF_ALPHA;
break;
}
+
+ // nasty hack because DP treats this the same as GL_SRC_ALPHA GL_ONE
+ if(layer->blendfunc[0] == GL_ONE && layer->blendfunc[1] == GL_ONE)
+ layer->texflags |= TEXF_ALPHA;
+
if (!(shader.surfaceparms & Q3SURFACEPARM_NOMIPMAPS))
layer->texflags |= TEXF_MIPMAP;
if (!(shader.textureflags & Q3TEXTUREFLAG_NOPICMIP))