[Scummvm-git-logs] scummvm master -> 68099ffd75a1a752c373dcdedf6b94660e96da8b

aquadran noreply at scummvm.org
Thu Oct 3 03:49:13 UTC 2024


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:
68099ffd75 WINTERMUTE: WME3D: Removed not needed code


Commit: 68099ffd75a1a752c373dcdedf6b94660e96da8b
    https://github.com/scummvm/scummvm/commit/68099ffd75a1a752c373dcdedf6b94660e96da8b
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-03T05:49:07+02:00

Commit Message:
WINTERMUTE: WME3D: Removed not needed code

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 d6f115c2434..5dded3d19a1 100644
--- a/engines/wintermute/base/gfx/xskinmesh.cpp
+++ b/engines/wintermute/base/gfx/xskinmesh.cpp
@@ -1130,12 +1130,7 @@ bool DXLoadSkinMesh(XFileData *fileData, DXBuffer &adjacencyOut, DXBuffer &mater
 	}
 	memcpy(materials.ptr(), meshData._materials, meshData._numMaterials * sizeof(DXMaterial));
 
-	if (meshData._numTriFaces== 0) {
-		materials.free();
-		cleanupMeshData(&meshData);
-		delete mesh;
-		return false;
-	}
+
 	DXBuffer adjacency = DXBuffer(meshData._numTriFaces * 3 * sizeof(uint32));
 	if (!adjacency.ptr()) {
 		materials.free();
@@ -1151,6 +1146,7 @@ bool DXLoadSkinMesh(XFileData *fileData, DXBuffer &adjacencyOut, DXBuffer &mater
 		return false;
 	}
 
+
 	*meshOut = mesh;
 	adjacencyOut = adjacency;
 	numMaterialsOut = meshData._numMaterials;




More information about the Scummvm-git-logs mailing list