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

This commit is contained in:
2018-11-27 14:24:01 +01:00
parent f34ffa825d
commit 0c6b409606
57 changed files with 538 additions and 597 deletions

View File

@@ -43,7 +43,7 @@ class NodeBrushPresetItem : public NodeButtonCustom
{
public:
int m_brushID;
ui::Brush m_brush;
Brush m_brush;
std::string high_path;
uint16_t high_id;
bool m_selected = false;
@@ -65,7 +65,7 @@ public:
virtual void init() override;
void handle_click(Node* target);
uint16_t get_texture_id(int index) const;
ui::Brush get_brush(int index) const;
Brush get_brush(int index) const;
int get_brush_id(int index) const;
};