Merge remote-tracking branch 'origin/scene_manipulators'

2026-07-31 11:15:52 +00:00 · 2018-04-13 16:54:22 +02:00
parent 56f19f01dd 659eb3412b
commit 913cdef297
12 changed files with 238 additions and 63 deletions
@@ -117,6 +117,8 @@ public:
    // preset if the current print or filament preset is not compatible.
    void                        update_compatible_with_printer(bool select_other_if_incompatible);

+    static bool parse_color(const std::string &scolor, unsigned char *rgb_out);
+
 private:
    std::string                 load_system_presets();