Merge remote-tracking branch 'upstream/openmw-35' into HEAD

10 years ago · 75db4d6473
parent 33e95c1519 dfaab1188f
commit 75db4d6473
2 changed files with 2 additions and 2 deletions
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@ -52,7 +52,7 @@ namespace MWClass
        registerClass (typeid (ESM::CreatureLevList).name(), instance);
    }

-    void CreatureLevList::insertObjectRendering(const MWWorld::Ptr &ptr, MWRender::RenderingInterface &renderingInterface) const
+    void CreatureLevList::insertObjectRendering(const MWWorld::Ptr &ptr, const std::string& model, MWRender::RenderingInterface &renderingInterface) const
    {
        ensureCustomData(ptr);

--- a/apps/openmw/mwclass/creaturelevlist.hpp
+++ b/apps/openmw/mwclass/creaturelevlist.hpp
@ -20,7 +20,7 @@ namespace MWClass

            static void registerSelf();

-            virtual void insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const;
+            virtual void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const;
            ///< Add reference into a cell for rendering

            virtual void readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state)