From 906d290935904a85d87f760eaaf14324eec3fab0 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 12 Sep 2012 12:41:12 +0200
Subject: [PATCH] Markers are actually hidden now. Inspecting the markers in
 NifSkope revealed why it didn't work previously: the flag that is being
 looked for is not present in any of the markers, nor any other flag or extra
 data to identify them. However, the root node name always starts with
 "marker", making it possible to do a string search.

---
 components/nifbullet/bullet_nif_loader.cpp | 5 +++++
 components/nifogre/ogre_nif_loader.cpp     | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/components/nifbullet/bullet_nif_loader.cpp b/components/nifbullet/bullet_nif_loader.cpp
index 071f03630e..b704046357 100644
--- a/components/nifbullet/bullet_nif_loader.cpp
+++ b/components/nifbullet/bullet_nif_loader.cpp
@@ -164,6 +164,11 @@ void ManualBulletShapeLoader::handleNode(Nif::Node *node, int flags,
     // the flags we currently use, at least.
     flags |= node->flags;
 
+    // Marker objects: just skip the entire node
+    /// \todo don't do this in the editor
+    if (node->name.find("marker") != std::string::npos)
+        return;
+
     // Check for extra data
     Nif::Extra *e = node;
     while (!e->extra.empty())
diff --git a/components/nifogre/ogre_nif_loader.cpp b/components/nifogre/ogre_nif_loader.cpp
index 5a5a614ef1..5127af966a 100644
--- a/components/nifogre/ogre_nif_loader.cpp
+++ b/components/nifogre/ogre_nif_loader.cpp
@@ -940,6 +940,11 @@ public:
     {
         flags |= node->flags;
 
+        // Marker objects: just skip the entire node
+        /// \todo don't do this in the editor
+        if (node->name.find("marker") != std::string::npos)
+            return;
+
         Nif::ExtraPtr e = node->extra;
         while(!e.empty())
         {