summaryrefslogtreecommitdiff
path: root/editor/plugins/canvas_item_editor_plugin.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-09-24 15:48:55 +0200
committerGitHub <noreply@github.com>2018-09-24 15:48:55 +0200
commitc432ce4ee15fc396b2bccbbe2661b5bd34b9bee1 (patch)
treeb6f8f478093fadbed631c0b93e9774e7c94415d3 /editor/plugins/canvas_item_editor_plugin.cpp
parent1f18a85ea1f79f023bc051bc43f80461325007e9 (diff)
parent943d0a90f563ccbe2e3fd631746aba5c14af043c (diff)
Merge pull request #22400 from Chaosus/viewport_color
Added viewport border color setting for canvas item editor
Diffstat (limited to 'editor/plugins/canvas_item_editor_plugin.cpp')
-rw-r--r--editor/plugins/canvas_item_editor_plugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index 2ea17fda1c..72451cfcb7 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -2815,7 +2815,7 @@ void CanvasItemEditor::_draw_axis() {
RID ci = viewport->get_canvas_item();
- Color area_axis_color(0.4, 0.4, 1.0, 0.4);
+ Color area_axis_color = EditorSettings::get_singleton()->get("editors/2d/viewport_border_color");
Size2 screen_size = Size2(ProjectSettings::get_singleton()->get("display/window/size/width"), ProjectSettings::get_singleton()->get("display/window/size/height"));