summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
Diffstat (limited to 'editor')
-rw-r--r--editor/plugins/animation_blend_tree_editor_plugin.cpp2
-rw-r--r--editor/plugins/canvas_item_editor_plugin.cpp2
-rw-r--r--editor/plugins/node_3d_editor_plugin.cpp2
-rw-r--r--editor/project_manager.cpp42
4 files changed, 4 insertions, 44 deletions
diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp
index 75d2bed1b2..c4a938f91d 100644
--- a/editor/plugins/animation_blend_tree_editor_plugin.cpp
+++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp
@@ -945,7 +945,7 @@ AnimationNodeBlendTreeEditor::AnimationNodeBlendTreeEditor() {
add_node->set_text(TTR("Add Node..."));
graph->get_zoom_hbox()->move_child(add_node, 0);
add_node->get_popup()->connect("id_pressed", callable_mp(this, &AnimationNodeBlendTreeEditor::_add_node));
- add_node->connect("about_to_popup", callable_mp(this, &AnimationNodeBlendTreeEditor::_update_options_menu));
+ add_node->connect("about_to_popup", callable_mp(this, &AnimationNodeBlendTreeEditor::_update_options_menu), varray(false));
add_options.push_back(AddOption("Animation", "AnimationNodeAnimation"));
add_options.push_back(AddOption("OneShot", "AnimationNodeOneShot", 2));
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index a3378d1550..b6722b9d48 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -2339,7 +2339,7 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
if (selection2.size() > 0) {
drag_type = DRAG_MOVE;
- drag_from = click;
+ drag_from = drag_start_origin;
_save_canvas_item_state(drag_selection);
}
return true;
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
index d3b462cda5..0a8cfa3815 100644
--- a/editor/plugins/node_3d_editor_plugin.cpp
+++ b/editor/plugins/node_3d_editor_plugin.cpp
@@ -1749,7 +1749,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
} else {
const bool movement_threshold_passed = _edit.original_mouse_pos.distance_to(_edit.mouse_pos) > 8 * EDSCALE;
if (clicked.is_valid() && movement_threshold_passed) {
- _compute_edit(_edit.mouse_pos);
+ _compute_edit(_edit.original_mouse_pos);
clicked = ObjectID();
_edit.mode = TRANSFORM_TRANSLATE;
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp
index 0be1f6d85b..372a77f67d 100644
--- a/editor/project_manager.cpp
+++ b/editor/project_manager.cpp
@@ -1233,46 +1233,6 @@ ProjectList::Item ProjectList::load_project_data(const String &p_property_key, b
const String main_scene = cf->get_value("application", "run/main_scene", "");
PackedStringArray project_features = cf->get_value("application", "config/features", PackedStringArray());
- bool project_features_dirty = false;
- // If there is no feature list currently present, force one to generate.
- if (project_features.is_empty()) {
- project_features = ProjectSettings::get_required_features();
- project_features_dirty = true;
- }
- // Check the rendering API.
- const String rendering_api = cf->get_value("rendering", "quality/driver/driver_name", "");
- if (rendering_api != "") {
- // Add the rendering API as a project feature if it doesn't already exist.
- if (!project_features.has(rendering_api)) {
- project_features.append(rendering_api);
- project_features_dirty = true;
- }
- }
- // Check for the existence of a csproj file.
- if (FileAccess::exists(path.plus_file(project_name + ".csproj"))) {
- // If there is a csproj file, add the C# feature if it doesn't already exist.
- if (!project_features.has("C#")) {
- project_features.append("C#");
- project_features_dirty = true;
- }
- } else {
- // If there isn't a csproj file, remove the C# feature if it exists.
- if (project_features.has("C#")) {
- project_features.remove_at(project_features.find("C#"));
- project_features_dirty = true;
- }
- }
- if (project_features_dirty) {
- project_features.sort();
- // Write the updated feature list, but only if the project config version is the same.
- // Never write to project files with a different config version!
- if (config_version == ProjectSettings::CONFIG_VERSION) {
- ProjectSettings *ps = ProjectSettings::get_singleton();
- ps->load_custom(conf);
- ps->set("application/config/features", project_features);
- ps->save_custom(conf);
- }
- }
PackedStringArray unsupported_features = ProjectSettings::get_unsupported_features(project_features);
uint64_t last_edited = 0;
@@ -1470,7 +1430,7 @@ void ProjectList::create_project_item_control(int p_index) {
int length = unsupported_features_str.length();
if (length > 0) {
Label *unsupported_label = memnew(Label(unsupported_features_str));
- unsupported_label->set_custom_minimum_size(Size2(length * 15, 10));
+ unsupported_label->set_custom_minimum_size(Size2(length * 15, 10) * EDSCALE);
unsupported_label->add_theme_font_override("font", get_theme_font(SNAME("title"), SNAME("EditorFonts")));
unsupported_label->add_theme_color_override("font_color", get_theme_color(SNAME("warning_color"), SNAME("Editor")));
unsupported_label->set_clip_text(true);