From 2fbdde34c619af2b9b1c4f88fdfb6f466d9d35c4 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Mon, 1 Jan 2024 21:55:55 +0300
Subject: [PATCH] Set paged refs' base node to null (#6335)

---
 apps/openmw/mwphysics/actor.cpp  | 6 +++++-
 apps/openmw/mwphysics/object.cpp | 3 +++
 apps/openmw/mwworld/scene.cpp    | 4 +---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index dec055d68f..e1efe6d242 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -102,7 +102,11 @@ namespace MWPhysics
         updateScaleUnsafe();
 
         if (!mRotationallyInvariant)
-            mRotation = mPtr.getRefData().getBaseNode()->getAttitude();
+        {
+            const SceneUtil::PositionAttitudeTransform* baseNode = mPtr.getRefData().getBaseNode();
+            if (baseNode)
+                mRotation = baseNode->getAttitude();
+        }
 
         addCollisionMask(getCollisionMask());
         updateCollisionObjectPositionUnsafe();
diff --git a/apps/openmw/mwphysics/object.cpp b/apps/openmw/mwphysics/object.cpp
index 53529ec729..9c97ac7c32 100644
--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@@ -110,6 +110,9 @@ namespace MWPhysics
         if (mShapeInstance->mAnimatedShapes.empty())
             return false;
 
+        if (!mPtr.getRefData().getBaseNode())
+            return false;
+
         assert(mShapeInstance->mCollisionShape->isCompound());
 
         btCompoundShape* compound = static_cast<btCompoundShape*>(mShapeInstance->mCollisionShape.get());
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index d8875b513e..72b2dc3022 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -115,9 +115,7 @@ namespace
         if (!refnum.hasContentFile() || !std::binary_search(pagedRefs.begin(), pagedRefs.end(), refnum))
             ptr.getClass().insertObjectRendering(ptr, model, rendering);
         else
-            ptr.getRefData().setBaseNode(
-                new SceneUtil::PositionAttitudeTransform); // FIXME remove this when physics code is fixed not to depend
-                                                           // on basenode
+            ptr.getRefData().setBaseNode(nullptr);
         setNodeRotation(ptr, rendering, rotation);
 
         if (ptr.getClass().useAnim())