Merge commit '897a59cdad66e593fd45eece9414d8414fa7f1ae'
This commit is contained in:
commit
6c34198f58
6
deps/ox/src/ox/model/typestore.hpp
vendored
6
deps/ox/src/ox/model/typestore.hpp
vendored
@ -58,7 +58,11 @@ class TypeStore {
|
|||||||
if (!std::is_constant_evaluated()) {
|
if (!std::is_constant_evaluated()) {
|
||||||
OX_REQUIRE_M(dt, loadDescriptor(typeId));
|
OX_REQUIRE_M(dt, loadDescriptor(typeId));
|
||||||
for (auto &f : dt->fieldList) {
|
for (auto &f : dt->fieldList) {
|
||||||
OX_RETURN_ERROR(this->getLoad(f.typeId).moveTo(f.type));
|
if (typeId == f.typeId) {
|
||||||
|
f.type = dt.get();
|
||||||
|
} else {
|
||||||
|
OX_RETURN_ERROR(this->getLoad(f.typeId).moveTo(f.type));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
auto &out = m_cache[typeId];
|
auto &out = m_cache[typeId];
|
||||||
out = std::move(dt);
|
out = std::move(dt);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user