diff options
| -rw-r--r-- | doc/classes/Tree.xml | 4 | ||||
| -rw-r--r-- | editor/editor_help_search.cpp | 12 | ||||
| -rw-r--r-- | editor/import/editor_import_collada.cpp | 4 | ||||
| -rw-r--r-- | platform/iphone/export/export.cpp | 18 |
4 files changed, 30 insertions, 8 deletions
diff --git a/doc/classes/Tree.xml b/doc/classes/Tree.xml index 14be256d85..1ad8166b91 100644 --- a/doc/classes/Tree.xml +++ b/doc/classes/Tree.xml @@ -315,12 +315,12 @@ <argument index="0" name="position" type="Vector2"> </argument> <description> - Emitted when an item is selected with right mouse button. + Emitted when an item is selected with the right mouse button. </description> </signal> <signal name="item_selected"> <description> - Emitted when an item is selected with right mouse button. + Emitted when an item is selected. </description> </signal> <signal name="multi_selected"> diff --git a/editor/editor_help_search.cpp b/editor/editor_help_search.cpp index f5717ddf2a..55d28871c8 100644 --- a/editor/editor_help_search.cpp +++ b/editor/editor_help_search.cpp @@ -53,6 +53,7 @@ void EditorHelpSearch::_load_settings() { if (enable_rl) { results_tree->add_constant_override("draw_relationship_lines", 1); results_tree->add_color_override("relationship_line_color", rl_color); + results_tree->add_constant_override("draw_guides", 0); } else { results_tree->add_constant_override("draw_relationship_lines", 0); results_tree->add_constant_override("draw_guides", 1); @@ -114,10 +115,13 @@ void EditorHelpSearch::_filter_combo_item_selected(int p_option) { void EditorHelpSearch::_confirmed() { + TreeItem *item = results_tree->get_selected(); + if (!item) + return; + // Activate the script editor and emit the signal with the documentation link to display. EditorNode::get_singleton()->set_visible_editor(EditorNode::EDITOR_SCRIPT); - TreeItem *item = results_tree->get_selected(); emit_signal("go_to_help", item->get_metadata(0)); hide(); @@ -139,6 +143,7 @@ void EditorHelpSearch::_notification(int p_what) { case NOTIFICATION_POPUP_HIDE: { results_tree->clear(); + get_ok()->set_disabled(true); EditorSettings::get_singleton()->set("interface/dialogs/search_help_bounds", get_rect()); } break; case NOTIFICATION_PROCESS: { @@ -147,7 +152,7 @@ void EditorHelpSearch::_notification(int p_what) { if (search.is_valid()) { if (search->work()) { // Search done. - get_ok()->set_disabled(results_tree->get_root()->get_children() == NULL); + get_ok()->set_disabled(!results_tree->get_selected()); search = Ref<Runner>(); set_process(false); } @@ -256,6 +261,7 @@ EditorHelpSearch::EditorHelpSearch() { results_tree->set_hide_root(true); results_tree->set_select_mode(Tree::SELECT_ROW); results_tree->connect("item_activated", this, "_confirmed"); + results_tree->connect("item_selected", get_ok(), "set_disabled", varray(false)); vbox->add_child(results_tree, true); _load_settings(); @@ -463,7 +469,7 @@ TreeItem *EditorHelpSearch::Runner::_create_class_item(TreeItem *p_parent, const Ref<Texture> icon = empty_icon; if (ui_service->has_icon(p_doc->name, "EditorIcons")) icon = ui_service->get_icon(p_doc->name, "EditorIcons"); - else if (ClassDB::is_parent_class(p_doc->name, "Object")) + else if (ClassDB::class_exists(p_doc->name) && ClassDB::is_parent_class(p_doc->name, "Object")) icon = ui_service->get_icon("Object", "EditorIcons"); String tooltip = p_doc->brief_description.strip_edges(); diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp index b133efead7..afd09748f3 100644 --- a/editor/import/editor_import_collada.cpp +++ b/editor/import/editor_import_collada.cpp @@ -1655,7 +1655,7 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones } } - Quat q = xform.basis.get_rotation_quat(); + Quat q = Math::is_equal_approx(xform.basis.determinant(), 0) ? Quat() : xform.basis.get_rotation_quat(); Vector3 s = xform.basis.get_scale(); Vector3 l = xform.origin; @@ -1705,7 +1705,7 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones xform = sk->get_bone_rest(nm.bone).affine_inverse() * xform; - Quat q = xform.basis.get_rotation_quat(); + Quat q = Math::is_equal_approx(xform.basis.determinant(), 0) ? Quat() : xform.basis.get_rotation_quat(); Vector3 s = xform.basis.get_scale(); Vector3 l = xform.origin; diff --git a/platform/iphone/export/export.cpp b/platform/iphone/export/export.cpp index 1fc497456c..7fb3afe9a9 100644 --- a/platform/iphone/export/export.cpp +++ b/platform/iphone/export/export.cpp @@ -982,11 +982,27 @@ bool EditorExportPlatformIOS::can_export(const Ref<EditorExportPreset> &p_preset err += "Custom release package not found.\n"; } + String team_id = p_preset->get("application/app_store_team_id"); + if (team_id.length() == 0) { + err += "App Store Team ID not specified - cannot configure the project.\n"; + } + + for (unsigned int i = 0; i < (sizeof(icon_infos) / sizeof(icon_infos[0])); ++i) { + IconInfo info = icon_infos[i]; + String icon_path = p_preset->get(info.preset_key); + if (icon_path.length() == 0) { + if (info.is_required) { + err += "Required icon is not specified in the preset.\n"; + } + break; + } + } + if (!err.empty()) r_error = err; r_missing_templates = !valid; - return valid; + return err.empty(); } EditorExportPlatformIOS::EditorExportPlatformIOS() { |