[Scummvm-git-logs] scummvm master -> a008a8f1129c3d3f753406bfd2dc0fdc337c3759

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a008a8f112 WINTERMUTE: Fixed missing accounting diffuse color vertex entry


Commit: a008a8f1129c3d3f753406bfd2dc0fdc337c3759
    https://github.com/scummvm/scummvm/commit/a008a8f1129c3d3f753406bfd2dc0fdc337c3759
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-11-20T19:04:00+01:00

Commit Message:
WINTERMUTE: Fixed missing accounting diffuse color vertex entry

Changed paths:
    engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
    engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp


diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp b/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
index 097f193e20f..ca2d65f6d55 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
@@ -74,6 +74,9 @@ bool XMeshOpenGL::render(XModel *model) {
 		normalOffset = offset;
 		offset += sizeof(DXVector3) / sizeof(float);
 	}
+	if (fvf & DXFVF_DIFFUSE) {
+		offset += sizeof(DXColorValue) / sizeof(float);
+	}
 	if (fvf & DXFVF_TEX1) {
 		textureOffset = offset;
 	}
diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
index 9294b1b7f25..64f4d4b4c64 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
@@ -99,6 +99,9 @@ bool XMeshOpenGLShader::render(XModel *model) {
 		normalOffset = offset;
 		offset += sizeof(DXVector3) / sizeof(float);
 	}
+	if (fvf & DXFVF_DIFFUSE) {
+		offset += sizeof(DXColorValue) / sizeof(float);
+	}
 	if (fvf & DXFVF_TEX1) {
 		textureOffset = offset;
 	}