diff options
| -rw-r--r-- | editor/import/editor_scene_importer_gltf.cpp | 2 | ||||
| -rw-r--r-- | platform/iphone/export/export.cpp | 18 |
2 files changed, 18 insertions, 2 deletions
diff --git a/editor/import/editor_scene_importer_gltf.cpp b/editor/import/editor_scene_importer_gltf.cpp index f47252d388..00ca86a43b 100644 --- a/editor/import/editor_scene_importer_gltf.cpp +++ b/editor/import/editor_scene_importer_gltf.cpp @@ -1695,7 +1695,7 @@ void EditorSceneImporterGLTF::_generate_node(GLTFState &state, int p_node, Node n->godot_nodes.push_back(node); - if (n->skin >= 0 && Object::cast_to<MeshInstance>(node)) { + if (n->skin >= 0 && n->skin < skeletons.size() && Object::cast_to<MeshInstance>(node)) { MeshInstance *mi = Object::cast_to<MeshInstance>(node); Skeleton *s = skeletons[n->skin]; 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() { |