From cd8fd444b124c62464223c579e69dea879c85bf4 Mon Sep 17 00:00:00 2001 From: alves Date: Mon, 29 Dec 2025 14:07:36 +0800 Subject: [PATCH 1/2] feature remove not work file --- src/common_func/common_func.hpp | 4 ++-- src/libslic3r/CMakeLists.txt | 3 --- src/libslic3r/libslic3r_version.h.in | 18 -------------- ...ed } else { Write-Host No build directory found } | 24 ------------------- 4 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 src/libslic3r/libslic3r_version.h.in delete mode 100644 t-Path depsbuild) { Remove-Item -Path depsbuild -Recurse -Force; Write-Host Build directory deleted } else { Write-Host No build directory found } diff --git a/src/common_func/common_func.hpp b/src/common_func/common_func.hpp index 352d71a4a4..9303b4196f 100644 --- a/src/common_func/common_func.hpp +++ b/src/common_func/common_func.hpp @@ -6,12 +6,12 @@ #define SLIC3R_APP_NAME "Snapmaker Orca" #define SLIC3R_APP_KEY "Snapmaker_Orca" #define SLIC3R_VERSION "01.10.01.50" -#define Snapmaker_VERSION "2.2.0" +#define Snapmaker_VERSION "2.2.1" #define MIN_FIRM_VER "1.0.0" #ifndef GIT_COMMIT_HASH #define GIT_COMMIT_HASH "0000000" // 0000000 means uninitialized #endif -#define SLIC3R_BUILD_ID "" +#define SLIC3R_BUILD_ID "2.2.1" // #define SLIC3R_RC_VERSION "01.10.01.50" #define BBL_RELEASE_TO_PUBLIC 1 #define BBL_INTERNAL_TESTING 0 diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index 7ddad94f1d..da6a6b42c1 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -7,8 +7,6 @@ if(NOT DEFINED ORCA_CHECK_GCODE_PLACEHOLDERS) set(ORCA_CHECK_GCODE_PLACEHOLDERS "0") endif() -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libslic3r_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h @ONLY) - if (MINGW) add_compile_options(-Wa,-mbig-obj) endif () @@ -462,7 +460,6 @@ if (APPLE) endif () add_library(libslic3r STATIC ${lisbslic3r_sources} - "${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h" ${OpenVDBUtils_SOURCES}) source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${lisbslic3r_sources}) diff --git a/src/libslic3r/libslic3r_version.h.in b/src/libslic3r/libslic3r_version.h.in deleted file mode 100644 index 4b029f9645..0000000000 --- a/src/libslic3r/libslic3r_version.h.in +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef __SLIC3R_VERSION_H -#define __SLIC3R_VERSION_H - -#define SLIC3R_APP_NAME "@SLIC3R_APP_NAME@" -#define SLIC3R_APP_KEY "@SLIC3R_APP_KEY@" -#define SLIC3R_VERSION "@SLIC3R_VERSION@" -#define Snapmaker_VERSION "@Snapmaker_VERSION@" -#define MIN_FIRM_VER "@MIN_FIRM_VER@" -#ifndef GIT_COMMIT_HASH - #define GIT_COMMIT_HASH "0000000" // 0000000 means uninitialized -#endif -#define SLIC3R_BUILD_ID "@SLIC3R_BUILD_ID@" -//#define SLIC3R_RC_VERSION "@SLIC3R_VERSION@" -#define BBL_RELEASE_TO_PUBLIC @BBL_RELEASE_TO_PUBLIC@ -#define BBL_INTERNAL_TESTING @BBL_INTERNAL_TESTING@ -#define ORCA_CHECK_GCODE_PLACEHOLDERS @ORCA_CHECK_GCODE_PLACEHOLDERS@ - -#endif /* __SLIC3R_VERSION_H */ diff --git a/t-Path depsbuild) { Remove-Item -Path depsbuild -Recurse -Force; Write-Host Build directory deleted } else { Write-Host No build directory found } b/t-Path depsbuild) { Remove-Item -Path depsbuild -Recurse -Force; Write-Host Build directory deleted } else { Write-Host No build directory found } deleted file mode 100644 index 285f886d48..0000000000 --- a/t-Path depsbuild) { Remove-Item -Path depsbuild -Recurse -Force; Write-Host Build directory deleted } else { Write-Host No build directory found } +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/deps/NanoSVG/NanoSVG.cmake b/deps/NanoSVG/NanoSVG.cmake -index 5c833e3249..ae6550d831 100644 ---- a/deps/NanoSVG/NanoSVG.cmake -+++ b/deps/NanoSVG/NanoSVG.cmake -@@ -3,7 +3,7 @@ - # for rasterizing svg files from their original size to a squared power of two texture on Windows systems using - # AMD Radeon graphics cards -  --orcaslicer_add_cmake_project(NanoSVG -+Snapmaker_Orca_add_cmake_project(NanoSVG - DEPENDS dep_Boost - URL https://github.com/SoftFever/nanosvg/archive/863f6aa97ef62028126fa2c19bd4350394c2e15e.zip - URL_HASH SHA256=8d9c1624ad6518dd6dfa31e4f8dc7da9ec243d88bae595c7a037450617fec851 -diff --git a/deps/libnoise/libnoise.cmake b/deps/libnoise/libnoise.cmake -index 0e19f26926..c0ba327394 100644 ---- a/deps/libnoise/libnoise.cmake -+++ b/deps/libnoise/libnoise.cmake -@@ -1,4 +1,4 @@ --orcaslicer_add_cmake_project(libnoise -+Snapmaker_Orca_add_cmake_project(libnoise - URL https://github.com/SoftFever/Orca-deps-libnoise/archive/refs/tags/1.0.zip - URL_HASH SHA256=96ffd6cc47898dd8147aab53d7d1b1911b507d9dbaecd5613ca2649468afd8b6 - ) -\ No newline at end of file From 38a029516ebeb200b818c709fe0e727fb933fd35 Mon Sep 17 00:00:00 2001 From: alves Date: Mon, 29 Dec 2025 15:43:16 +0800 Subject: [PATCH 2/2] fix scale img is null and crash bug. --- src/slic3r/GUI/ObjectDataViewModel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/ObjectDataViewModel.cpp b/src/slic3r/GUI/ObjectDataViewModel.cpp index 584a24ca13..80a92a703a 100644 --- a/src/slic3r/GUI/ObjectDataViewModel.cpp +++ b/src/slic3r/GUI/ObjectDataViewModel.cpp @@ -574,7 +574,8 @@ void ObjectDataViewModel::UpdateBitmapForNode(ObjectDataViewModelNode *node) } bmp = m_bitmap_cache->insert(scaled_bitmap_name, bmps); } - + if (!bmp) + return; node->SetBitmap(*bmp); }