merged with master

2019-03-21 17:22:36 +11:00
parent 262e93460f 1da4a315f8
commit dd06230c04
46 changed files with 943 additions and 320 deletions
@@ -41,7 +41,6 @@
 #include <random>

 #include "ui/collapsiblewidget.h"
-#include "ui/checkboxex.h"
 #include "effectrow.h"
 #include "effectgizmo.h"
 #include "rendering/qopenglshaderprogramptr.h"