From 79a6ffd21645166ce51d398178b66e95333940b5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 15 Jan 2014 06:41:16 +0100
Subject: [PATCH] Closes #1107: Do not create box shapes unless the box
 collision flag is enabled

---
 components/nifbullet/bulletnifloader.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 9c4fee7a0..65f90c8c1 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -229,9 +229,12 @@ void ManualBulletShapeLoader::handleNode(btTriangleMesh* mesh, const Nif::Node *
     {
         if(node->hasBounds)
         {
-            mShape->mBoxTranslation = node->boundPos;
-            mShape->mBoxRotation = node->boundRot;
-            mBoundingBox = new btBoxShape(getbtVector(node->boundXYZ));
+            if (node->flags & Nif::NiNode::Flag_BBoxCollision)
+            {
+                mShape->mBoxTranslation = node->boundPos;
+                mShape->mBoxRotation = node->boundRot;
+                mBoundingBox = new btBoxShape(getbtVector(node->boundXYZ));
+            }
         }
         else if(node->recType == Nif::RC_NiTriShape)
         {