Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Merge branch 'master' into menuscripts

Browse source
This commit is contained in:
uramer 2024-01-27 15:41:25 +01:00
commit 9cce2e39ba
215 changed files with 4307 additions and 2011 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/lua_ui/element.cpp
View file

@ -38,7 +38,7 @@ namespace LuaUi
if (typeField != sol::nil && templateType != type)
throw std::logic_error(std::string("Template layout type ") + type
+ std::string(" doesn't match template type ") + templateType);
type = templateType;
type = std::move(templateType);
}
return type;
}