mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-25 22:25:21 +00:00
Compare commits
4 Commits
v2.4.0-alp
...
fix/cli-se
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e9ea8a8eb7 | ||
|
|
8c6f0b4b47 | ||
|
|
1a2118f696 | ||
|
|
899bbafc99 |
@@ -45,8 +45,8 @@
|
|||||||
<color type="primary" scheme_preference="dark">#00695C</color>
|
<color type="primary" scheme_preference="dark">#00695C</color>
|
||||||
</branding>
|
</branding>
|
||||||
<releases>
|
<releases>
|
||||||
<release version="2.4.0-alpha" date="2026-05-22" type="development">
|
<release version="2.4.0-dev" date="2026-05-22" type="development">
|
||||||
<url type="details">https://github.com/OrcaSlicer/OrcaSlicer/releases/tag/2.4.0-alpha</url>
|
<url type="details">https://github.com/OrcaSlicer/OrcaSlicer/releases/tag/nightly-builds</url>
|
||||||
<description>
|
<description>
|
||||||
<p>See the release page for detailed changelog.</p>
|
<p>See the release page for detailed changelog.</p>
|
||||||
</description>
|
</description>
|
||||||
|
|||||||
@@ -2195,7 +2195,7 @@ std::vector<std::vector<ExPolygons>> segmentation_by_painting(const PrintObject
|
|||||||
|
|
||||||
// Returns multi-material segmentation based on painting in multi-material segmentation gizmo
|
// Returns multi-material segmentation based on painting in multi-material segmentation gizmo
|
||||||
std::vector<std::vector<ExPolygons>> multi_material_segmentation_by_painting(const PrintObject &print_object, const std::function<void()> &throw_on_cancel_callback) {
|
std::vector<std::vector<ExPolygons>> multi_material_segmentation_by_painting(const PrintObject &print_object, const std::function<void()> &throw_on_cancel_callback) {
|
||||||
const size_t num_facets_states = print_object.print()->config().filament_colour.size() + 1;
|
const size_t num_facets_states = print_object.print()->config().filament_diameter.size() + 1;
|
||||||
const float max_width = float(print_object.config().mmu_segmented_region_max_width.value);
|
const float max_width = float(print_object.config().mmu_segmented_region_max_width.value);
|
||||||
const float interlocking_depth = float(print_object.config().mmu_segmented_region_interlocking_depth.value);
|
const float interlocking_depth = float(print_object.config().mmu_segmented_region_interlocking_depth.value);
|
||||||
const bool interlocking_beam = print_object.config().interlocking_beam.value;
|
const bool interlocking_beam = print_object.config().interlocking_beam.value;
|
||||||
|
|||||||
@@ -883,7 +883,6 @@ static inline void apply_mm_segmentation(PrintObject &print_object, ThrowOnCance
|
|||||||
double z = print_object.get_layer(int(range.begin()))->slice_z;
|
double z = print_object.get_layer(int(range.begin()))->slice_z;
|
||||||
auto it_layer_range = layer_range_first(layer_ranges, z);
|
auto it_layer_range = layer_range_first(layer_ranges, z);
|
||||||
// BBS
|
// BBS
|
||||||
const size_t num_extruders = print_object.print()->config().filament_diameter.size();
|
|
||||||
|
|
||||||
struct ByExtruder {
|
struct ByExtruder {
|
||||||
ExPolygons expolygons;
|
ExPolygons expolygons;
|
||||||
@@ -903,6 +902,7 @@ static inline void apply_mm_segmentation(PrintObject &print_object, ThrowOnCance
|
|||||||
it_layer_range = layer_range_next(layer_ranges, it_layer_range, layer.slice_z);
|
it_layer_range = layer_range_next(layer_ranges, it_layer_range, layer.slice_z);
|
||||||
const PrintObjectRegions::LayerRangeRegions &layer_range = *it_layer_range;
|
const PrintObjectRegions::LayerRangeRegions &layer_range = *it_layer_range;
|
||||||
// Gather per extruder expolygons.
|
// Gather per extruder expolygons.
|
||||||
|
const size_t num_extruders = segmentation[layer_id].size();
|
||||||
by_extruder.assign(num_extruders, ByExtruder());
|
by_extruder.assign(num_extruders, ByExtruder());
|
||||||
by_region.assign(layer.region_count(), ByRegion());
|
by_region.assign(layer.region_count(), ByRegion());
|
||||||
bool layer_split = false;
|
bool layer_split = false;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ set(SLIC3R_APP_KEY "OrcaSlicer")
|
|||||||
if(NOT DEFINED BBL_INTERNAL_TESTING)
|
if(NOT DEFINED BBL_INTERNAL_TESTING)
|
||||||
set(BBL_INTERNAL_TESTING "0")
|
set(BBL_INTERNAL_TESTING "0")
|
||||||
endif()
|
endif()
|
||||||
set(SoftFever_VERSION "2.4.0-alpha")
|
set(SoftFever_VERSION "2.4.0-dev")
|
||||||
string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)"
|
string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)"
|
||||||
SoftFever_VERSION_MATCH ${SoftFever_VERSION})
|
SoftFever_VERSION_MATCH ${SoftFever_VERSION})
|
||||||
set(ORCA_VERSION_MAJOR ${CMAKE_MATCH_1})
|
set(ORCA_VERSION_MAJOR ${CMAKE_MATCH_1})
|
||||||
|
|||||||
Reference in New Issue
Block a user