final merge fixes

Ground.cpp

@@ -857,10 +857,10 @@ void TSubRect::RaNodeAdd(TGroundNode *Node)
     switch (Node->iType)
     {
     case TP_TRACK:
-        {
-            Node->nNext3 = nRender;
-            nRender = Node;
-        } // DL: do nieprzezroczystych
+		{
+			Node->nNext3 = nRenderRect;
+			nRenderRect = Node;
+		} // VBO: do nieprzezroczystych z sektora
         break;
     case GL_TRIANGLE_STRIP:
     case GL_TRIANGLE_FAN:

Texture.cpp

@@ -813,10 +813,10 @@ texture_manager::Bind( texture_manager::size_type const Id ) {
     //       having it active would lead to some terrain and spline chunks receiving wrong
     //       (the most recent?) texture, instead of the proper one. It'd also affect negatively
     //       light point rendering.
-    if( Id == m_activetexture ) {
-        // don't bind again what's already active
-        return;
-    }
+    //if( Id == m_activetexture ) {
+    //    // don't bind again what's already active
+    //    return;
+    //}
 
     // TODO: do binding in texture object, add support for other types
     if( Id != 0 ) {

Track.cpp

@@ -2865,6 +2865,7 @@ TTrack * TTrack::RaAnimate()
                 glGetBufferSubData(
                     GL_ARRAY_BUFFER, SwitchExtension->iLeftVBO * sizeof(CVertNormTex),
                     2 * 2 * 12 * sizeof(CVertNormTex), &Vert); // pobranie fragmentu bufora VBO
+				//m7todo: co to jest?
                 if (SwitchExtension->RightSwitch)
                 { // nowa wersja z SPKS, ale odwrotnie lewa/prawa
                     SwitchExtension->Segments[0]->RaAnimate(v, rpts3, -nnumPts, fTexLength, 0,

shader.cpp

@@ -132,7 +132,7 @@ gl_program_light::gl_program_light(std::vector<gl_shader> v) : gl_program_mvp(v)
 
 	glUseProgram(id);
 	glUniform3f(ambient_uniform, 1.0f, 1.0f, 1.0f);
-	glUniform1i(lcount_uniform, 0);
+	glUniform1ui(lcount_uniform, 0);
 }
 
 void gl_program_light::set_ambient(glm::vec3 &ambient)