[Scummvm-git-logs] scummvm master -> 89629f10d844a83313cb6832511f502712ecaa25

[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:
89629f10d8 WINTERMUTE: Fixed regression for Xmesh::update() not returning proper status for static mesh


Commit: 89629f10d844a83313cb6832511f502712ecaa25
    https://github.com/scummvm/scummvm/commit/89629f10d844a83313cb6832511f502712ecaa25
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-25T13:05:43+02:00

Commit Message:
WINTERMUTE: Fixed regression for Xmesh::update() not returning proper status for static mesh

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


diff --git a/engines/wintermute/base/gfx/xmesh.cpp b/engines/wintermute/base/gfx/xmesh.cpp
index 508f3fa7402..f25d90734c3 100644
--- a/engines/wintermute/base/gfx/xmesh.cpp
+++ b/engines/wintermute/base/gfx/xmesh.cpp
@@ -186,8 +186,6 @@ bool XMesh::update(FrameNode *parentFrame) {
 	if (!_blendedMesh)
 		return false;
 
-	bool res = false;
-
 	// update skinned mesh
 	if (_skinMesh) {
 		int numBones = _skinMesh->getNumBones();
@@ -199,14 +197,9 @@ bool XMesh::update(FrameNode *parentFrame) {
 		}
 
 		// generate skinned mesh
-		res = _skinMesh->updateSkinnedMesh(boneMatrices, _blendedMesh);
+		_skinMesh->updateSkinnedMesh(boneMatrices, _blendedMesh);
 		delete [] boneMatrices;
 
-		if (!res) {
-			BaseEngine::LOG(0, "Error updating skinned mesh");
-			return res;
-		}
-
 		// update mesh bounding box
 		byte *points = _blendedMesh->getVertexBuffer().ptr();
 
@@ -263,7 +256,7 @@ bool XMesh::update(FrameNode *parentFrame) {
 		// update bounding box
 		DXComputeBoundingBox((DXVector3 *)newPoints, _blendedMesh->getNumVertices(), DXGetFVFVertexSize(_blendedMesh->getFVF()), &_BBoxStart, &_BBoxEnd);
 	}
-	return res;
+	return true;
 }
 
 //////////////////////////////////////////////////////////////////////////