From 6233682d043abd9e7c9e00350665b4935fef2822 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Wed, 29 May 2024 00:13:21 -0500 Subject: [PATCH] [jasper/world/studio] Remove erroneous noexcept --- .../world/src/studio/worldeditor/worldeditor-imgui.cpp | 4 ++-- .../world/src/studio/worldeditor/worldeditor-imgui.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp index f7535ac..18aec95 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp @@ -114,7 +114,7 @@ void WorldEditorImGui::onActivated() noexcept { oxLogError(m_view.setupWorld()); } -void WorldEditorImGui::copy() noexcept { +void WorldEditorImGui::copy() { if (m_selection) { auto const assetId = this->assetId().unwrapThrow(); auto mods = ox::make_unique(assetId, m_selection->size()); @@ -375,7 +375,7 @@ ox::Error WorldEditorImGui::handleDrop(float fbPaneScale) noexcept { std::move(mods)); } oxReturnError(loadWorldStatic(m_objCache, m_doc).moveTo(m_worldStatic)); - return ox::Error{}; + return {}; } ox::Error WorldEditorImGui::addObjSet(ox::StringView path) noexcept { diff --git a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp index 34a2458..a18af6d 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp +++ b/src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.hpp @@ -58,7 +58,7 @@ class WorldEditorImGui: public studio::Editor { void onActivated() noexcept override; protected: - void copy() noexcept override; + void copy() override; void cut() noexcept override;