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_panel_brush.cpp
+++ b/src/node_panel_brush.cpp
@@ -205,7 +205,7 @@ void NodePanelBrushPreset::handle_click(Node* target)
        on_brush_changed(this, m_current->m_brushID);
 }

-ui::Brush NodePanelBrushPreset::get_brush(int index) const
+Brush NodePanelBrushPreset::get_brush(int index) const
 {
    auto b = m_brushes[index]->m_brush;
    TextureManager::load(m_brushes[index]->high_path.c_str(), true);