Browse Source

Moves the guides colors to editor settings

Gilles Roudiere 7 years ago
parent
commit
7b02f5591d
2 changed files with 2 additions and 1 deletions
  1. 1 0
      editor/editor_settings.cpp
  2. 1 1
      editor/plugins/canvas_item_editor_plugin.cpp

+ 1 - 0
editor/editor_settings.cpp

@@ -416,6 +416,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	hints["editors/3d/freelook/freelook_modifier_speed_factor"] = PropertyInfo(Variant::REAL, "editors/3d/freelook/freelook_modifier_speed_factor", PROPERTY_HINT_RANGE, "0.0, 10.0, 0.1");
 	_initial_set("editors/3d/freelook/freelook_speed_zoom_link", false);
 
+	_initial_set("editors/2d/guides_color", Color(0.6, 0.0, 0.8));
 	_initial_set("editors/2d/bone_width", 5);
 	_initial_set("editors/2d/bone_color1", Color(1.0, 1.0, 1.0, 0.9));
 	_initial_set("editors/2d/bone_color2", Color(0.75, 0.75, 0.75, 0.9));

+ 1 - 1
editor/plugins/canvas_item_editor_plugin.cpp

@@ -2294,7 +2294,7 @@ void CanvasItemEditor::_draw_focus() {
 
 void CanvasItemEditor::_draw_guides() {
 
-	Color guide_color = EDITOR_DEF("editors/2d/guides_color", Color(0.6, 0.0, 0.8));
+	Color guide_color = EditorSettings::get_singleton()->get("editors/2d/guides_color");
 	Transform2D xform = viewport_scrollable->get_transform() * transform;
 
 	// Guides already there