summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editor/editor_paths.cpp4
-rw-r--r--scene/gui/color_picker.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/editor/editor_paths.cpp b/editor/editor_paths.cpp
index a5c2fe093c..977af3cfae 100644
--- a/editor/editor_paths.cpp
+++ b/editor/editor_paths.cpp
@@ -153,8 +153,8 @@ EditorPaths::EditorPaths() {
}
}
- if (!dir->dir_exists("templates")) {
- dir->make_dir("templates");
+ if (!dir->dir_exists("export_templates")) {
+ dir->make_dir("export_templates");
}
}
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index bfe5ee335b..d9f603f136 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -998,10 +998,10 @@ void ColorPicker::_w_input(const Ref<InputEvent> &p_event) {
h = y / w_edit->get_size().height;
}
- if (current_mode == MODE_HSV) {
- color.set_hsv(h, s, v, color.a);
- } else if (current_mode == MODE_OKHSL) {
+ if (actual_shape == SHAPE_OKHSL_CIRCLE) {
color.set_ok_hsl(h, s, v, color.a);
+ } else {
+ color.set_hsv(h, s, v, color.a);
}
last_color = color;