sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolved conflicts

Browse Source 
Former-commit-id: 4bd4e4f8435d701d16d3864dd030a6c1cff48c47
This commit is contained in:
Lynix
2012-12-02 21:49:14 +01:00
parent 6a3087cc26 d0545eb760
commit 780da2cfa5
46 changed files with 1251 additions and 1283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Renderer/Enums.hpp
View File

@@ -158,7 +158,9 @@ enum nzTextureFilter
nzTextureFilter_Nearest,
nzTextureFilter_Trilinear,
nzTextureFilter_Max = nzTextureFilter_Trilinear
nzTextureFilter_Default,
nzTextureFilter_Max = nzTextureFilter_Default
};
enum nzTextureWrap