From b663583dd0daeb8803cd3f98723096b14aa7853b Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Tue, 20 Oct 2026 16:10:06 +0200 Subject: [PATCH] Drop osg includes that nothing uses The physics heightfield, recast mesh object, Bullet NIF loader and world scene headers included osg/ref_ptr, osg/Referenced or osg/Object without using any of them, which made non-render code look tied to OSG; scene.cpp, the one file that does use osg::ref_ptr, now includes it itself. --- apps/openmw/mwphysics/heightfield.cpp | 2 -- apps/openmw/mwphysics/heightfield.hpp | 2 -- apps/openmw/mwworld/scene.cpp | 2 ++ apps/openmw/mwworld/scene.hpp | 1 - components/detournavigator/recastmeshobject.hpp | 2 -- components/nifbullet/bulletnifloader.hpp | 2 -- 6 files changed, 2 insertions(+), 9 deletions(-) diff --git a/apps/openmw/mwphysics/heightfield.cpp b/apps/openmw/mwphysics/heightfield.cpp index 4049d8f171..0810cdc46b 100644 --- a/apps/openmw/mwphysics/heightfield.cpp +++ b/apps/openmw/mwphysics/heightfield.cpp @@ -3,8 +3,6 @@ #include -#include - #include #include diff --git a/apps/openmw/mwphysics/heightfield.hpp b/apps/openmw/mwphysics/heightfield.hpp index 97df65ed2a..694beb823a 100644 --- a/apps/openmw/mwphysics/heightfield.hpp +++ b/apps/openmw/mwphysics/heightfield.hpp @@ -1,8 +1,6 @@ #ifndef OPENMW_MWPHYSICS_HEIGHTFIELD_H #define OPENMW_MWPHYSICS_HEIGHTFIELD_H -#include - #include #include diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp index 53fd23e3da..c65dce9aaf 100644 --- a/apps/openmw/mwworld/scene.cpp +++ b/apps/openmw/mwworld/scene.cpp @@ -6,6 +6,8 @@ #include +#include + #include #include #include diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp index 1e2a921afc..6e25c3220c 100644 --- a/apps/openmw/mwworld/scene.hpp +++ b/apps/openmw/mwworld/scene.hpp @@ -3,7 +3,6 @@ #include #include -#include #include "positioncellgrid.hpp" #include "ptr.hpp" diff --git a/components/detournavigator/recastmeshobject.hpp b/components/detournavigator/recastmeshobject.hpp index cc2adc96ba..1d382d1934 100644 --- a/components/detournavigator/recastmeshobject.hpp +++ b/components/detournavigator/recastmeshobject.hpp @@ -9,8 +9,6 @@ #include -#include - #include #include diff --git a/components/nifbullet/bulletnifloader.hpp b/components/nifbullet/bulletnifloader.hpp index e227e5f60c..6691b8a041 100644 --- a/components/nifbullet/bulletnifloader.hpp +++ b/components/nifbullet/bulletnifloader.hpp @@ -8,8 +8,6 @@ #include #include -#include -#include #include