GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 04:25:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation

Browse Source
This commit is contained in:
tamasmeszaros 2022-11-30 12:51:00 +01:00
parent 75a25b5ad7
commit 7831b6e6cc
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/SLAPrintSteps.cpp
View File

@ -423,7 +423,7 @@ static void filter_support_points_by_modifiers(
!is_enforced && enf_idx < enforcers[idx].size(); !is_enforced && enf_idx < enforcers[idx].size();
++enf_idx) ++enf_idx)
{ {
if (enforcers[idx][enf_idx].contains_b(sp2d)) if (enforcers[idx][enf_idx].contains(sp2d))
is_enforced = true; is_enforced = true;
} }
} }
@ -434,7 +434,7 @@ static void filter_support_points_by_modifiers(
!is_blocked && blk_idx < blockers[idx].size(); !is_blocked && blk_idx < blockers[idx].size();
++blk_idx) ++blk_idx)
{ {
if (blockers[idx][blk_idx].contains_b(sp2d)) if (blockers[idx][blk_idx].contains(sp2d))
is_blocked = true; is_blocked = true;
} }
} }

4
src/slic3r/GUI/GUI_Factories.cpp
View File

@ -164,12 +164,12 @@ static const constexpr std::array<std::pair<const char *, const char *>, 5> ADD_
}}; }};
// Note: id accords to type of the sub-object (adding volume), so sequence of the menu items is important // Note: id accords to type of the sub-object (adding volume), so sequence of the menu items is important
const std::vector<std::pair<std::string, std::string>> MenuFactory::TEXT_VOLUME_ICONS { static const constexpr std::array<std::pair<const char *, const char *>, 3> TEXT_VOLUME_ICONS {{
// menu_item Name menu_item bitmap name // menu_item Name menu_item bitmap name
{L("Add text"), "add_text_part"}, // ~ModelVolumeType::MODEL_PART {L("Add text"), "add_text_part"}, // ~ModelVolumeType::MODEL_PART
{L("Add negative text"), "add_text_negative" }, // ~ModelVolumeType::NEGATIVE_VOLUME {L("Add negative text"), "add_text_negative" }, // ~ModelVolumeType::NEGATIVE_VOLUME
{L("Add text modifier"), "add_text_modifier"}, // ~ModelVolumeType::PARAMETER_MODIFIER {L("Add text modifier"), "add_text_modifier"}, // ~ModelVolumeType::PARAMETER_MODIFIER
}; }};
static Plater* plater() static Plater* plater()
{ {

2
src/slic3r/GUI/GUI_Factories.hpp
View File

@ -33,8 +33,6 @@ struct SettingsFactory
class MenuFactory class MenuFactory
{ {
public: public:
static const std::vector<std::pair<std::string, std::string>> ADD_VOLUME_MENU_ITEMS;
static const std::vector<std::pair<std::string, std::string>> TEXT_VOLUME_ICONS;
static std::vector<wxBitmapBundle*> get_volume_bitmaps(); static std::vector<wxBitmapBundle*> get_volume_bitmaps();
static std::vector<wxBitmapBundle*> get_text_volume_bitmaps(); static std::vector<wxBitmapBundle*> get_text_volume_bitmaps();