From 86165d38d26e6a76f4ff5ba317cf9dfdada042c5 Mon Sep 17 00:00:00 2001 From: scrawl Date: Sat, 31 Jan 2015 19:21:16 +0100 Subject: [PATCH] Add exception handling in addObjectToScene --- apps/openmw/mwworld/scene.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp index b6ad5c104..72d475f16 100644 --- a/apps/openmw/mwworld/scene.cpp +++ b/apps/openmw/mwworld/scene.cpp @@ -544,9 +544,16 @@ namespace MWWorld void Scene::addObjectToScene (const Ptr& ptr) { - addObject(ptr, *mPhysics, mRendering); - MWBase::Environment::get().getWorld()->rotateObject(ptr, 0, 0, 0, true); - MWBase::Environment::get().getWorld()->scaleObject(ptr, ptr.getCellRef().getScale()); + try + { + addObject(ptr, *mPhysics, mRendering); + MWBase::Environment::get().getWorld()->rotateObject(ptr, 0, 0, 0, true); + MWBase::Environment::get().getWorld()->scaleObject(ptr, ptr.getCellRef().getScale()); + } + catch (std::exception& e) + { + std::cerr << "error during rendering: " << e.what() << std::endl; + } } void Scene::removeObjectFromScene (const Ptr& ptr)