diff options
author | Andreas Grapentin <andreas@grapentin.org> | 2018-01-15 19:21:55 +0100 |
---|---|---|
committer | Andreas Grapentin <andreas@grapentin.org> | 2018-01-15 19:21:55 +0100 |
commit | 66f14a9940c108b81337920dd766ac8863ced4f2 (patch) | |
tree | b30e73f074d585aa6605141ec5dc7eaacbe5d805 /libre/openmw/bullet-251.patch | |
parent | a14fd54a63bc63295ff54ae19699c17a4621c711 (diff) | |
download | abslibre-66f14a9940c108b81337920dd766ac8863ced4f2.tar.gz abslibre-66f14a9940c108b81337920dd766ac8863ced4f2.tar.bz2 abslibre-66f14a9940c108b81337920dd766ac8863ced4f2.zip |
libre/openmw: updated to 0.43.0
Diffstat (limited to 'libre/openmw/bullet-251.patch')
-rw-r--r-- | libre/openmw/bullet-251.patch | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/libre/openmw/bullet-251.patch b/libre/openmw/bullet-251.patch deleted file mode 100644 index 27f66dd82..000000000 --- a/libre/openmw/bullet-251.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 5ccbabc27d7f1ec02447680e4bed28d12333fb77 Mon Sep 17 00:00:00 2001 -From: scrawl <scrawl@baseoftrash.de> -Date: Fri, 14 Oct 2016 20:59:55 +0200 -Subject: [PATCH] Fix build against bullet with profiler disabled (Fixes #3592) - ---- - apps/openmw/mwgui/debugwindow.cpp | 7 +++++++ - apps/openmw/mwphysics/physicssystem.cpp | 3 +++ - 2 files changed, 10 insertions(+) - -diff --git a/apps/openmw/mwgui/debugwindow.cpp b/apps/openmw/mwgui/debugwindow.cpp -index 37ea347..a29910f 100644 ---- a/apps/openmw/mwgui/debugwindow.cpp -+++ b/apps/openmw/mwgui/debugwindow.cpp -@@ -7,6 +7,8 @@ - - #include <LinearMath/btQuickprof.h> - -+#ifndef BT_NO_PROFILE -+ - namespace - { - void bulletDumpRecursive(CProfileIterator* pit, int spacing, std::stringstream& os) -@@ -71,6 +73,7 @@ namespace - } - } - -+#endif // BT_NO_PROFILE - - namespace MWGui - { -@@ -92,10 +95,13 @@ namespace MWGui - - MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize(); - mMainWidget->setSize(viewSize); -+ -+ - } - - void DebugWindow::onFrame(float dt) - { -+#ifndef BT_NO_PROFILE - if (!isVisible()) - return; - -@@ -115,6 +121,7 @@ namespace MWGui - size_t previousPos = mBulletProfilerEdit->getVScrollPosition(); - mBulletProfilerEdit->setCaption(stream.str()); - mBulletProfilerEdit->setVScrollPosition(std::min(previousPos, mBulletProfilerEdit->getVScrollRange()-1)); -+#endif - } - - } -diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp -index 954d195..e442fbd 100644 ---- a/apps/openmw/mwphysics/physicssystem.cpp -+++ b/apps/openmw/mwphysics/physicssystem.cpp -@@ -14,6 +14,7 @@ - #include <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h> - #include <BulletCollision/CollisionDispatch/btCollisionWorld.h> - #include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h> -+ - #include <LinearMath/btQuickprof.h> - - #include <components/nifbullet/bulletnifloader.hpp> -@@ -1363,8 +1364,10 @@ namespace MWPhysics - for (std::set<Object*>::iterator it = mAnimatedObjects.begin(); it != mAnimatedObjects.end(); ++it) - (*it)->animateCollisionShapes(mCollisionWorld); - -+#ifndef BT_NO_PROFILE - CProfileManager::Reset(); - CProfileManager::Increment_Frame_Counter(); -+#endif - } - - void PhysicsSystem::debugDraw() |