mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-13 19:01:21 +00:00
ExPikaPaka
b0d586837b
Three conflicts, all in the texture displacement gizmo, all resolved by keeping both sides: - Two independent additions landed next to apply_standard_mode_presets(): upstream's store_panel_state() and this branch's image-mode declarations. - m_color_tex_source: upstream changed it from a raw const void* to a weak_ptr to the image bytes, so a freed and reallocated image can no longer pass for the old one. That is the better key and it is kept; the colour correction key this branch added sits beside it, and the cache test now checks the image, the smoothing and the correction.