Mercurial > mm7

diff Texture.cpp @ 1680:33171f1f3daf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Fri, 20 Sep 2013 14:55:53 +0200
parents a699ecd7aeb3
children a5637690ffbb
line wrap: on
line diff
--- a/Texture.cpp	Fri Sep 20 14:45:44 2013 +0200
+++ b/Texture.cpp	Fri Sep 20 14:55:53 2013 +0200
@@ -177,15 +177,15 @@
 std::array<unsigned int, 5> uTextureID_Optkb;
 
 unsigned int optvid_base_texture_id;
-unsigned int bloodsplats_texture_id; // weak
-unsigned int us_colored_lights_texture_id; // weak
-unsigned int tinting_texture_id; // weak
+unsigned int bloodsplats_texture_id;
+unsigned int us_colored_lights_texture_id;
+unsigned int tinting_texture_id;
 unsigned int uTextureID_507C20; // weak
 unsigned int uTextureID_507C24; // weak
 std::array<unsigned int, 10> pTextureIDs_GammaPositions;
-unsigned int not_available_bloodsplats_texture_id; // weak
-unsigned int not_available_us_colored_lights_texture_id; // weak
-unsigned int not_available_tinting_texture_id; // weak
+unsigned int not_available_bloodsplats_texture_id;
+unsigned int not_available_us_colored_lights_texture_id;
+unsigned int not_available_tinting_texture_id;
 
 
 unsigned int uTextureID_detaliz_close_button; // weak