From 7e7c8bd989ab661ab0a759b86fd6976be88d8270 Mon Sep 17 00:00:00 2001
From: Shon Ferguson <shonferg@users.sourceforge.net>
Date: Tue, 4 Jul 2006 16:10:24 +0000
Subject: [PATCH] We can't have functions on compounds as all files for them
are generated. Removed CalcNumTriangles so Niflib programs will link.
---
gen/SkinPartition.h | 4 ----
gen/obj_impl.cpp | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/gen/SkinPartition.h b/gen/SkinPartition.h
index 35384f1f..da1ef775 100644
--- a/gen/SkinPartition.h
+++ b/gen/SkinPartition.h
@@ -26,10 +26,6 @@ struct NIFLIB_API SkinPartition {
* Number of triangles in this submesh.
*/
mutable ushort numTriangles;
- /*!
- * Number of triangles in this submesh.
- */
- ushort CalcNumTriangles() const;
/*!
* Number of bones influencing this submesh.
*/
diff --git a/gen/obj_impl.cpp b/gen/obj_impl.cpp
index 0131e7f8..93fc8436 100644
--- a/gen/obj_impl.cpp
+++ b/gen/obj_impl.cpp
@@ -10789,7 +10789,7 @@ void NiSkinPartition::InternalWrite( ostream& out, map<NiObjectRef,uint> link_ma
skinPartitionBlocks[i1].numWeightsPerVertex = ushort((skinPartitionBlocks[i1].vertexWeights.size() > 0) ? skinPartitionBlocks[i1].vertexWeights[0].size() : 0);
skinPartitionBlocks[i1].numStrips = ushort(skinPartitionBlocks[i1].stripLengths.size());
skinPartitionBlocks[i1].numBones = ushort(skinPartitionBlocks[i1].bones.size());
- skinPartitionBlocks[i1].numTriangles = skinPartitionBlocks[i1].CalcNumTriangles();
+ skinPartitionBlocks[i1].numTriangles = ushort(skinPartitionBlocks[i1].triangles.size());
skinPartitionBlocks[i1].numVertices = ushort(skinPartitionBlocks[i1].vertexMap.size());
NifStream( skinPartitionBlocks[i1].numVertices, out, version );
NifStream( skinPartitionBlocks[i1].numTriangles, out, version );
@@ -10880,7 +10880,7 @@ std::string NiSkinPartition::InternalAsString( bool verbose ) const {
skinPartitionBlocks[i1].numWeightsPerVertex = ushort((skinPartitionBlocks[i1].vertexWeights.size() > 0) ? skinPartitionBlocks[i1].vertexWeights[0].size() : 0);
skinPartitionBlocks[i1].numStrips = ushort(skinPartitionBlocks[i1].stripLengths.size());
skinPartitionBlocks[i1].numBones = ushort(skinPartitionBlocks[i1].bones.size());
- skinPartitionBlocks[i1].numTriangles = skinPartitionBlocks[i1].CalcNumTriangles();
+ skinPartitionBlocks[i1].numTriangles = ushort(skinPartitionBlocks[i1].triangles.size());
skinPartitionBlocks[i1].numVertices = ushort(skinPartitionBlocks[i1].vertexMap.size());
out << " Num Vertices: " << skinPartitionBlocks[i1].numVertices << endl;
out << " Num Triangles: " << skinPartitionBlocks[i1].numTriangles << endl;
--
GitLab