Merge remote-tracking branch 'origin/master' into Particle-Update

Former-commit-id: 7ec9fba80c2b47a1fb811c7912df67262986c9f0
2014-08-25 23:09:36 +02:00
parent f3baf9f9df 98aa804de5
commit 54382afc37
12 changed files with 44 additions and 49 deletions
--- a/src/Nazara/Graphics/Loaders/OBJ/Loader.cpp
+++ b/src/Nazara/Graphics/Loaders/OBJ/Loader.cpp
@@ -142,7 +142,7 @@ namespace
 						if (index >= 0)
 						{
 							const NzVector3f& uvw = texCoords[index];
-							vertex.uv.Set(uvw.x, uvw.y);
+							vertex.uv.Set(uvw.x, (parameters.mesh.flipUVs) ? 1.f - uvw.y : uvw.y); // Inversion des UVs si demandé
 						}
 						else
 							hasTexCoords = false;