mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 12:35:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'castray' into 'master'

Browse Source 
Fix RayCastingResult warning

See merge request OpenMW/openmw!331
This commit is contained in:
AnyOldName3 2020-10-08 19:48:08 +00:00
commit da49901dbc
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/openmw/mwphysics/physicssystem.cpp
View File

@ -265,7 +265,11 @@ namespace MWPhysics
RayCastingResult PhysicsSystem::castRay(const osg::Vec3f &from, const osg::Vec3f &to, const MWWorld::ConstPtr& ignore, std::vector<MWWorld::Ptr> targets, int mask, int group) const
{
if (from == to)
return RayCastingResult { false };
{
RayCastingResult result;
result.mHit = false;
return result;
}
btVector3 btFrom = Misc::Convert::toBullet(from);
btVector3 btTo = Misc::Convert::toBullet(to);