Merge remote-tracking branch 'tmj/master' into sim

Segment.cpp

@@ -12,9 +12,10 @@ http://mozilla.org/MPL/2.0/.
 
 #include "Globals.h"
 #include "Logs.h"
+#include "parser.h"
 #include "utilities.h"
 #include "Track.h"
-#include "opengl33renderer.h"
+#include "renderer.h"
 
 void
 segment_data::deserialize( cParser &Input, glm::dvec3 const &Offset ) {
@@ -430,10 +431,12 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Ori
             m2 = 1.f;
             jmm2 = 0.f;
         }
-
+/*
         while( tv1 < 0.0 ) {
             tv1 += 1.0;
         }
+*/
+        tv1 = clamp_circular( tv1, 1.0f );
         tv2 = tv1 - step / texturelength; // mapowanie na końcu segmentu
 
         t = fTsBuffer[ i ]; // szybsze od GetTFromS(s);