Merge branch 'advanced_color_selector' by caryoscelus

manongjohn · Oct 3, 2020 · b60144f · b60144f
2 parents 9839467 + 582fea1
commit b60144f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/thirdparty/Qt-Color-Widgets/src/color_wheel.cpp b/thirdparty/Qt-Color-Widgets/src/color_wheel.cpp
@@ -29,6 +29,7 @@
 #include <QLineF>
 #include <QDragEnterEvent>
 #include <QMimeData>
+#include <QPainterPath>
 #include "color_utils.hpp"
 
 namespace color_widgets {

diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
@@ -2267,6 +2267,7 @@ void MainWindow::defineActions() {
   menuAct->setIcon(createQIcon("messagecenter"));
   menuAct = createMenuWindowsAction(MI_OpenColorModel, tr("&Color Model"), "");
   menuAct->setIcon(createQIcon("colormodel"));
+  createMenuWindowsAction(MI_OpenAdvancedColorSelector, tr("Advanced Color Selector"), "");
   menuAct =
       createMenuWindowsAction(MI_OpenStudioPalette, tr("&Studio Palette"), "");
   menuAct->setIcon(createQIcon("studiopalette"));