drinkingtea/jasper
drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

[jasper/world/studio] Remove erroneous noexcept
All checks were successful
Build / build (push) Successful in 3m14s
Details

Browse Source
This commit is contained in:
Gary Talent 2024-05-29 00:13:21 -05:00
parent df322b092d
commit 6233682d04
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp
View File

@ -114,7 +114,7 @@ void WorldEditorImGui::onActivated() noexcept {
oxLogError(m_view.setupWorld()); oxLogError(m_view.setupWorld());
} }
void WorldEditorImGui::copy() noexcept { void WorldEditorImGui::copy() {
if (m_selection) { if (m_selection) {
auto const assetId = this->assetId().unwrapThrow(); auto const assetId = this->assetId().unwrapThrow();
auto mods = ox::make_unique<TileClipboard>(assetId, m_selection->size()); auto mods = ox::make_unique<TileClipboard>(assetId, m_selection->size());
@ -375,7 +375,7 @@ ox::Error WorldEditorImGui::handleDrop(float fbPaneScale) noexcept {
std::move(mods)); std::move(mods));
} }
oxReturnError(loadWorldStatic(m_objCache, m_doc).moveTo(m_worldStatic)); oxReturnError(loadWorldStatic(m_objCache, m_doc).moveTo(m_worldStatic));
return ox::Error{}; return {};
} }
ox::Error WorldEditorImGui::addObjSet(ox::StringView path) noexcept { ox::Error WorldEditorImGui::addObjSet(ox::StringView path) noexcept {

2
src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp
View File

@ -58,7 +58,7 @@ class WorldEditorImGui: public studio::Editor {
void onActivated() noexcept override; void onActivated() noexcept override;
protected: protected:
void copy() noexcept override; void copy() override;
void cut() noexcept override; void cut() noexcept override;