Merge branch 'master' into v2.x

Conflicts: src/gl/textures/gl_material.cpp
2014-09-09 01:30:11 +02:00 · 2014-09-09 01:30:11 +02:00 · 9b8869e78d
commit 9b8869e78d
parent b96dd6c421 86d9c7ec8e
18 changed files with 88 additions and 42 deletions
--- a/src/gl/textures/gl_material.cpp
+++ b/src/gl/textures/gl_material.cpp
@ -772,7 +772,6 @@ FMaterial * FMaterial::ValidateTexture(FTexture * tex, bool expand)
 		FMaterial *gltex = tex->gl_info.Material[expand];
 		if (gltex == NULL) 
 		{
-			//@sync-tex
 			gltex = new FMaterial(tex, expand);
 		}
 		return gltex;