Ticket #4383: 4338_uvs.patch

source/renderer/InstancingModelRenderer.cpp

@@ -338 +338 @@
         shader->VertexAttribPointer(str_a_tangent, 4, GL_FLOAT, GL_TRUE, stride, base + m->imodeldef->m_Tangent.offset);
 
     if (streamflags & STREAM_UV0)
-        shader->TexCoordPointer(GL_TEXTURE0, 2, GL_FLOAT, stride, base + m->imodeldef->m_UVs[0].offset);
+    {
+        if (def.GetNumUVsPerVertex() >= 1)
+            shader->TexCoordPointer(GL_TEXTURE0, 2, GL_FLOAT, stride, base + m->imodeldef->m_UVs[0].offset);
+        else
+            ONCE(LOGERROR("Model '%s' has no UV0 set.", def.GetName().string8().c_str()));
+    }
 
-    if ((streamflags & STREAM_UV1) && def.GetNumUVsPerVertex() >= 2)
-        shader->TexCoordPointer(GL_TEXTURE1, 2, GL_FLOAT, stride, base + m->imodeldef->m_UVs[1].offset);
+    if (streamflags & STREAM_UV1)
+    {
+        if (def.GetNumUVsPerVertex() >= 2)
+            shader->TexCoordPointer(GL_TEXTURE1, 2, GL_FLOAT, stride, base + m->imodeldef->m_UVs[1].offset);
+        else
+            ONCE(LOGERROR("Model '%s' has no UV1 set.", def.GetName().string8().c_str()));
+    }
 
     // GPU skinning requires extra attributes to compute positions/normals
     if (m->gpuSkinning)