From 8fc5633933a22da39546b157a68b457d145ab345 Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 17 Nov 2022 11:55:25 +0100 Subject: [PATCH] Added TOOL_ prefix to the Tools enum's values in PaintCanvas. --- modules/paint/nodes/paint_canvas.cpp | 22 +++++++++++----------- modules/paint/nodes/paint_canvas.h | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/paint/nodes/paint_canvas.cpp b/modules/paint/nodes/paint_canvas.cpp index 790456e47..a6043de83 100644 --- a/modules/paint/nodes/paint_canvas.cpp +++ b/modules/paint/nodes/paint_canvas.cpp @@ -415,15 +415,15 @@ void PaintCanvas::_bind_methods() { ClassDB::bind_method(D_METHOD("get_image_texture"), &PaintCanvas::get_image_texture); ClassDB::bind_method(D_METHOD("get_preview_image_texture"), &PaintCanvas::get_preview_image_texture); - BIND_ENUM_CONSTANT(PAINT); - BIND_ENUM_CONSTANT(BRUSH); - BIND_ENUM_CONSTANT(BUCKET); - BIND_ENUM_CONSTANT(RAINBOW); - BIND_ENUM_CONSTANT(LINE); - BIND_ENUM_CONSTANT(RECT); - BIND_ENUM_CONSTANT(DARKEN); - BIND_ENUM_CONSTANT(BRIGHTEN); - BIND_ENUM_CONSTANT(COLORPICKER); - BIND_ENUM_CONSTANT(CUT); - BIND_ENUM_CONSTANT(PASTECUT); + BIND_ENUM_CONSTANT(TOOL_PENCIL); + BIND_ENUM_CONSTANT(TOOL_BRUSH); + BIND_ENUM_CONSTANT(TOOL_BUCKET); + BIND_ENUM_CONSTANT(TOOL_RAINBOW); + BIND_ENUM_CONSTANT(TOOL_LINE); + BIND_ENUM_CONSTANT(TOOL_RECT); + BIND_ENUM_CONSTANT(TOOL_DARKEN); + BIND_ENUM_CONSTANT(TOOL_BRIGHTEN); + BIND_ENUM_CONSTANT(TOOL_COLORPICKER); + BIND_ENUM_CONSTANT(TOOL_CUT); + BIND_ENUM_CONSTANT(TOOL_PASTECUT); } diff --git a/modules/paint/nodes/paint_canvas.h b/modules/paint/nodes/paint_canvas.h index c8fde3ffc..d872a8c0f 100644 --- a/modules/paint/nodes/paint_canvas.h +++ b/modules/paint/nodes/paint_canvas.h @@ -13,17 +13,17 @@ class PaintCanvas : public PaintNode { public: enum Tools { - PAINT = 0, - BRUSH, - BUCKET, - RAINBOW, - LINE, - RECT, - DARKEN, - BRIGHTEN, - COLORPICKER, - CUT, - PASTECUT, + TOOL_PENCIL = 0, + TOOL_BRUSH, + TOOL_BUCKET, + TOOL_RAINBOW, + TOOL_LINE, + TOOL_RECT, + TOOL_DARKEN, + TOOL_BRIGHTEN, + TOOL_COLORPICKER, + TOOL_CUT, + TOOL_PASTECUT, }; bool get_symmetry_x() const;