1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 22:45:35 +00:00

Merge branch 'fix_build' into 'master'

Fix build on ubuntu 18.04

See merge request OpenMW/openmw!1487
This commit is contained in:
psi29a 2021-12-17 07:36:31 +00:00
commit 0aa103c6d8

View file

@ -210,7 +210,7 @@ namespace NavMeshTool
ESM::Land::LandData& landData = *landDatas.emplace_back(std::make_unique<ESM::Land::LandData>()); ESM::Land::LandData& landData = *landDatas.emplace_back(std::make_unique<ESM::Land::LandData>());
land->loadData(ESM::Land::DATA_VHGT, &landData); land->loadData(ESM::Land::DATA_VHGT, &landData);
heightfields.emplace_back(std::vector(std::begin(landData.mHeights), std::end(landData.mHeights))); heightfields.push_back(std::vector<float>(std::begin(landData.mHeights), std::end(landData.mHeights)));
HeightfieldSurface surface; HeightfieldSurface surface;
surface.mHeights = heightfields.back().data(); surface.mHeights = heightfields.back().data();
surface.mMinHeight = landData.mMinHeight; surface.mMinHeight = landData.mMinHeight;