Merge commit '9e11019b87ba27d1dac9e097dc212a126e404218'

deps/ox/ox-docs.md

@@ -179,6 +179,8 @@ ox::Result<int> f2() noexcept {
 ```oxRequire``` by default creates a const, but there is also an ```oxRequireM``` (oxRequire Mutable)
 variant for creating a non-const value.
 
+* ```oxRequireM``` - oxRequire Mutable
+
 ### Logging and Output
 
 Ox provides for logging and debug prints via the ```oxTrace```, ```oxDebug```, and ```oxError``` macros.

src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp

@@ -154,7 +154,8 @@ void PaletteEditorImGui::drawColorsEditor() noexcept {
 		ImGui::TableSetupColumn("Blue", ImGuiTableColumnFlags_WidthFixed, 40);
 		ImGui::TableSetupColumn("Preview", ImGuiTableColumnFlags_NoHide);
 		ImGui::TableHeadersRow();
-		for (auto i = 0u; auto const&c : m_pal.pages[m_page].colors) {
+		if (m_page < m_pal.pages.size()) {
+			for (auto i = 0u; auto const &c: m_pal.pages[m_page].colors) {
 				ig::IDStackItem const idStackItem(static_cast<int>(i));
 				ImGui::TableNextRow();
 				drawColumn(i + 1);
@@ -172,6 +173,7 @@ void PaletteEditorImGui::drawColorsEditor() noexcept {
 				++i;
 			}
 		}
+	}
 	ImGui::EndTable();
 	if (colorEditor) {
 		ImGui::SameLine();

src/olympic/studio/applib/src/newmenu.cpp

@@ -77,7 +77,7 @@ void NewMenu::drawNewItemName(studio::StudioContext &sctx) noexcept {
 	drawWindow(sctx.tctx, &m_open, [this, &sctx] {
 		auto const typeIdx = static_cast<std::size_t>(m_selectedType);
 		if (typeIdx < m_types.size()) {
-			ImGui::InputText("Name", m_itemName.data(), m_itemName.cap());
+			ig::InputText("Name", m_itemName);
 		}
 		drawLastPageButtons(sctx);
 	});