From 9f390a7d4b91774cf21a92ec0d1f19dc7d7953fc Mon Sep 17 00:00:00 2001 From: Dandielo Date: Fri, 6 Feb 2026 12:29:01 +0900 Subject: [PATCH 1/7] Update build-dispatch.yaml --- .github/workflows/build-dispatch.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build-dispatch.yaml b/.github/workflows/build-dispatch.yaml index 781c82514..0fdc9f5b1 100644 --- a/.github/workflows/build-dispatch.yaml +++ b/.github/workflows/build-dispatch.yaml @@ -20,6 +20,11 @@ on: description: "Clang tools version to be installed" required: false type: string + secrets: + conan_user: + required: true + conan_token: + required: true jobs: build: From 7a55eccb034c3853a8910e840507ad454de4009f Mon Sep 17 00:00:00 2001 From: Dandielo Date: Fri, 6 Feb 2026 12:30:51 +0900 Subject: [PATCH 2/7] Update build-validate-android.yaml --- .github/workflows/build-validate-android.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-validate-android.yaml b/.github/workflows/build-validate-android.yaml index 36cd057bc..39f2dac76 100644 --- a/.github/workflows/build-validate-android.yaml +++ b/.github/workflows/build-validate-android.yaml @@ -23,3 +23,6 @@ jobs: host-platform: 'windows-latest' target-platform: 'android' targets: "${{ matrix.project }}-${{ matrix.pipeline }}-${{ matrix.config }}" + secrets: + conan_user: ${{ secrets.CONAN_USER }} + conan_token: ${{ secrets.CONAN_TOKEN }} From a58835d34cfeabe4b0b177dae1def433b483d6cb Mon Sep 17 00:00:00 2001 From: Dandielo Date: Fri, 6 Feb 2026 12:31:07 +0900 Subject: [PATCH 3/7] Update build-validate-emscripten.yaml --- .github/workflows/build-validate-emscripten.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-validate-emscripten.yaml b/.github/workflows/build-validate-emscripten.yaml index 279abeb61..4d91f0b55 100644 --- a/.github/workflows/build-validate-emscripten.yaml +++ b/.github/workflows/build-validate-emscripten.yaml @@ -24,3 +24,6 @@ jobs: target-platform: 'web' targets: "${{ matrix.project }}-${{ matrix.pipeline }}-${{ matrix.config }}" clang-version: '22' + secrets: + conan_user: ${{ secrets.CONAN_USER }} + conan_token: ${{ secrets.CONAN_TOKEN }} From 08df2b61846569659e4e63d06dbe2f490fd80cc5 Mon Sep 17 00:00:00 2001 From: Dandielo Date: Fri, 6 Feb 2026 12:31:21 +0900 Subject: [PATCH 4/7] Update build-validate-linux.yaml --- .github/workflows/build-validate-linux.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-validate-linux.yaml b/.github/workflows/build-validate-linux.yaml index 1b811a1d5..e183bf7e0 100644 --- a/.github/workflows/build-validate-linux.yaml +++ b/.github/workflows/build-validate-linux.yaml @@ -24,3 +24,6 @@ jobs: target-platform: 'linux' targets: "${{ matrix.project }}-${{ matrix.pipeline }}-${{ matrix.config }}" clang-version: '20' + secrets: + conan_user: ${{ secrets.CONAN_USER }} + conan_token: ${{ secrets.CONAN_TOKEN }} From c02e7c96957d0fd5e0d0e1c8f410964c6fa9e384 Mon Sep 17 00:00:00 2001 From: Dandielo Date: Fri, 6 Feb 2026 12:31:30 +0900 Subject: [PATCH 5/7] Update build-validate-windows.yaml --- .github/workflows/build-validate-windows.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-validate-windows.yaml b/.github/workflows/build-validate-windows.yaml index 5d2fa163c..1da579ffa 100644 --- a/.github/workflows/build-validate-windows.yaml +++ b/.github/workflows/build-validate-windows.yaml @@ -23,3 +23,6 @@ jobs: host-platform: 'windows-latest' target-platform: 'win32' targets: "${{ matrix.project }}-${{ matrix.pipeline }}-${{ matrix.config }}" + secrets: + conan_user: ${{ secrets.CONAN_USER }} + conan_token: ${{ secrets.CONAN_TOKEN }} From c5344cd8c58407aa04842281b1defb9df6aff702 Mon Sep 17 00:00:00 2001 From: Dandielo Date: Fri, 6 Feb 2026 21:18:34 +0900 Subject: [PATCH 6/7] Update imguizmo on Windows targets. --- source/conanfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/conanfile.txt b/source/conanfile.txt index f981b3d00..ee5ec97ef 100644 --- a/source/conanfile.txt +++ b/source/conanfile.txt @@ -31,7 +31,7 @@ msdfgen/1.9.2@iceshard/stable msdf_atlas_gen/1.2.2@iceshard/stable # Editor only packages -imguizmo/1.91.3@iceshard/stable +imguizmo/1.91.5@iceshard/stable [requires-Linux-Clang] catch2/3.3.2@iceshard/stable From 30559e2748fceb55141eba12b6316505ed9e5876 Mon Sep 17 00:00:00 2001 From: Dandielo Date: Fri, 6 Feb 2026 21:44:55 +0900 Subject: [PATCH 7/7] Disable imguizmo until we decide if to use it or not. --- source/code/core/devui/private/devui_context.cxx | 2 +- source/code/modules/imgui_module/private/imgui_module.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/code/core/devui/private/devui_context.cxx b/source/code/core/devui/private/devui_context.cxx index 6f3bee3f8..b8b522318 100644 --- a/source/code/core/devui/private/devui_context.cxx +++ b/source/code/core/devui/private/devui_context.cxx @@ -86,7 +86,7 @@ namespace ice ImGui::SetCurrentContext((ImGuiContext*)params.native_context); return true; } -#if ISP_WINDOWS +#if ISP_WINDOWS && 0 else if (context_name == "devui-context/imguizmo"_sid) { ImGuizmo::SetImGuizmoContext((ImGuizmo::ImGuizmoContext*)params.native_context); diff --git a/source/code/modules/imgui_module/private/imgui_module.cxx b/source/code/modules/imgui_module/private/imgui_module.cxx index d62fbfeee..370ef61e1 100644 --- a/source/code/modules/imgui_module/private/imgui_module.cxx +++ b/source/code/modules/imgui_module/private/imgui_module.cxx @@ -68,7 +68,7 @@ namespace ice::devui { ICE_LOG(LogSeverity::Warning, LogTag::System, "Failed to initialize 'ImGui' context on module!"); } -#if ISP_WINDOWS +#if ISP_WINDOWS && 0 setup_params.native_context = ImGuizmo::GetImGuizmoContext(); if (cb("devui-context/imguizmo"_sid, setup_params, userdata) == false) { @@ -136,7 +136,7 @@ namespace ice::devui ImGui::SetAllocatorFunctions(imgui_memalloc, imgui_memfree, global_ImGuiAllocator); ImGui::CreateContext(); -#if ISP_WINDOWS +#if ISP_WINDOWS && 0 ImGuizmo::Initialize(); #endif ice::devui::styles::apply_color_theme(ice::devui::styles::Theme::Dark); @@ -149,7 +149,7 @@ namespace ice::devui { ice::devui::styles::pop_stylesheet(); ice::devui::styles::pop_color_theme(); -#if ISP_WINDOWS +#if ISP_WINDOWS && 0 ImGuizmo::Shutdown(); #endif ImGui::DestroyContext();