Merge remote-tracking branch 'remotes/origin/dev' into vk-materials

This commit is contained in:
bubnikv 2019-09-19 11:49:49 +02:00
commit 80c5eaacdf
14 changed files with 334 additions and 181 deletions

View file

@ -217,6 +217,7 @@ public:
void on_config_change(const DynamicPrintConfig &config);
// On activating the parent window.
void on_activate();
const DynamicPrintConfig* get_plater_config() const;
void update_object_menu();