ObjectDataViewModel is extracted from wxExtentions to the separated file

+ parse_color function is moved to BitmapCache from PresetBundle
2020-02-02 22:22:40 +01:00
parent eb6e0c06e4
commit 3f7ebee396
12 changed files with 2325 additions and 2398 deletions
--- a/src/slic3r/GUI/PresetBundle.hpp
+++ b/src/slic3r/GUI/PresetBundle.hpp
@@ -129,8 +129,6 @@ public:
    // preset if the current print or filament preset is not compatible.
    void                        update_compatible(bool select_other_if_incompatible);

-    static bool                 parse_color(const std::string &scolor, unsigned char *rgb_out);
-
    void                        load_default_preset_bitmaps();

    // Set the is_visible flag for printer vendors, printer models and printer variants