remove ui namespace which is not really used, move CameraData in camera_modes.h to avoid the inclusion of canva.h

2018-11-27 14:24:01 +01:00
parent f34ffa825d
commit 0c6b409606
57 changed files with 538 additions and 597 deletions
--- a/src/node_colorwheel.h
+++ b/src/node_colorwheel.h
@@ -8,10 +8,10 @@
 class NodeColorWheel : public Node
 {
 public:
-    ui::Circle m_circle;
-    ui::Plane m_cur_hue;
-    ui::Circle m_cur_quad;
-    ui::Plane m_quad;
+    Circle m_circle;
+    Plane m_cur_hue;
+    Circle m_cur_quad;
+    Plane m_quad;
    NodeBorder* m_color_cur;
    glm::vec3 m_hsv;
    GLuint m_tri_vbo;