Merge branch 'master' into materials

2026-07-31 11:15:52 +00:00 · 2019-10-07 17:23:37 +02:00
parent 570c038eb7 555fcc151d
commit fd6d32135b
129 changed files with 78584 additions and 4740 deletions
@@ -219,6 +219,7 @@ public:
    // On activating the parent window.
    void on_activate();
    const DynamicPrintConfig* get_plater_config() const;
+    std::vector<std::string> get_extruder_colors_from_plater_config() const;

    void update_object_menu();