From 115c30a57314537f576cd5c5a51f4ad6ba83858a Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Wed, 8 Feb 2023 13:22:58 +0300
Subject: [PATCH 1/2] Read bhkConvexTransformShape

---
 components/nif/niffile.cpp |  1 +
 components/nif/physics.cpp | 16 ++++++++++++++++
 components/nif/physics.hpp | 10 ++++++++++
 components/nif/record.hpp  |  1 +
 4 files changed, 28 insertions(+)

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 2f4d471227..6a139d970e 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -161,6 +161,7 @@ namespace Nif
             { "bhkPackedNiTriStripsShape", &construct<bhkPackedNiTriStripsShape, RC_bhkPackedNiTriStripsShape> },
             { "hkPackedNiTriStripsData", &construct<hkPackedNiTriStripsData, RC_hkPackedNiTriStripsData> },
             { "bhkConvexVerticesShape", &construct<bhkConvexVerticesShape, RC_bhkConvexVerticesShape> },
+            { "bhkConvexTransformShape", &construct<bhkConvexTransformShape, RC_bhkConvexTransformShape> },
             { "bhkBoxShape", &construct<bhkBoxShape, RC_bhkBoxShape> },
             { "bhkCapsuleShape", &construct<bhkCapsuleShape, RC_bhkCapsuleShape> },
             { "bhkSphereShape", &construct<bhkSphereShape, RC_bhkSphereShape> },
diff --git a/components/nif/physics.cpp b/components/nif/physics.cpp
index 9b58585c36..6342740c94 100644
--- a/components/nif/physics.cpp
+++ b/components/nif/physics.cpp
@@ -281,6 +281,22 @@ namespace Nif
             nif->getVector4s(mNormals, numNormals);
     }
 
+    void bhkConvexTransformShape::read(NIFStream* nif)
+    {
+        mShape.read(nif);
+        mHavokMaterial.read(nif);
+        mRadius = nif->getFloat();
+        nif->skip(8); // Unused
+        std::vector<float> mat;
+        nif->getFloats(mat, 16);
+        mTransform.set(mat.data());
+    }
+
+    void bhkConvexTransformShape::post(Reader& nif)
+    {
+        mShape.post(nif);
+    }
+
     void bhkBoxShape::read(NIFStream* nif)
     {
         bhkConvexShape::read(nif);
diff --git a/components/nif/physics.hpp b/components/nif/physics.hpp
index 6ab1415fa5..90d1ab7c0d 100644
--- a/components/nif/physics.hpp
+++ b/components/nif/physics.hpp
@@ -314,6 +314,16 @@ namespace Nif
         void read(NIFStream* nif) override;
     };
 
+    struct bhkConvexTransformShape : public bhkShape
+    {
+        bhkShapePtr mShape;
+        HavokMaterial mHavokMaterial;
+        float mRadius;
+        osg::Matrixf mTransform;
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
     // A box
     struct bhkBoxShape : public bhkConvexShape
     {
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 7a7fd5f5c8..ffa6801456 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -137,6 +137,7 @@ namespace Nif
         RC_bhkPackedNiTriStripsShape,
         RC_hkPackedNiTriStripsData,
         RC_bhkConvexVerticesShape,
+        RC_bhkConvexTransformShape,
         RC_bhkBoxShape,
         RC_bhkCapsuleShape,
         RC_bhkSphereShape,

From 8ebdd1e4a51499e448413fc38bba5d82e915e199 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Wed, 8 Feb 2023 13:46:54 +0300
Subject: [PATCH 2/2] Fix material data loading for 10.0.1.0

---
 components/nif/node.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/nif/node.cpp b/components/nif/node.cpp
index 6347de932e..e457f7d769 100644
--- a/components/nif/node.cpp
+++ b/components/nif/node.cpp
@@ -144,7 +144,7 @@ namespace Nif
 
     void NiGeometry::MaterialData::read(NIFStream* nif)
     {
-        if (nif->getVersion() <= NIFStream::generateVersion(10, 0, 1, 0))
+        if (nif->getVersion() < NIFStream::generateVersion(10, 0, 1, 0))
             return;
         unsigned int num = 0;
         if (nif->getVersion() <= NIFStream::generateVersion(20, 1, 0, 3))