[Scummvm-git-logs] scummvm master -> 202bc4cada01f2e976567a42005a9275a07f1de8

[aquadran]

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

Summary:
202bc4cada WINTERMUTE: It's fine to override texture/normal to already declared.


Commit: 202bc4cada01f2e976567a42005a9275a07f1de8
    https://github.com/scummvm/scummvm/commit/202bc4cada01f2e976567a42005a9275a07f1de8
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2026-02-01T21:27:32+01:00

Commit Message:
WINTERMUTE: It's fine to override texture/normal to already declared.

Changed paths:
    engines/wintermute/base/gfx/xskinmesh.cpp


diff --git a/engines/wintermute/base/gfx/xskinmesh.cpp b/engines/wintermute/base/gfx/xskinmesh.cpp
index 18f440c100f..98af68e6c32 100644
--- a/engines/wintermute/base/gfx/xskinmesh.cpp
+++ b/engines/wintermute/base/gfx/xskinmesh.cpp
@@ -549,12 +549,10 @@ static bool parseDeclData(XFileData &fileData, struct MeshData *meshData) {
 	for (i = 0; i < declObj->_numElements; ++i) {
 		switch (declObj->_elements[i]._usage) {
 		case DXDECLUSAGE_NORMAL:
-			assert(!(meshData->_fvf & DXFVF_NORMAL));
 			normalOffset = vertexSize;
 			meshData->_fvf |= DXFVF_NORMAL;
 			break;
 		case DXDECLUSAGE_TEXCOORD:
-			assert(!(meshData->_fvf & DXFVF_TEX1));
 			textureOffset = vertexSize;
 			meshData->_fvf |= DXFVF_TEX1;
 			break;