godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94934 from Hilderin/fix-no-validation-blender-path-on-import 

Fix no validation on Blender path on import
This commit is contained in:
Rémi Verschelde 2024-08-19 16:05:26 +02:00
parent 6bf64027b7 2dc9cf50c5
commit ce1ba7328f
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/gltf/editor/editor_scene_importer_blend.cpp
View File

@ -115,8 +115,15 @@ Node *EditorSceneFormatImporterBlend::import_scene(const String &p_path, uint32_
List<String> *r_missing_deps, Error *r_err) { List<String> *r_missing_deps, Error *r_err) {
String blender_path = EDITOR_GET("filesystem/import/blender/blender_path"); String blender_path = EDITOR_GET("filesystem/import/blender/blender_path");
if (blender_major_version == -1 || blender_minor_version == -1) { ERR_FAIL_COND_V_MSG(blender_path.is_empty(), nullptr, "Blender path is empty, check your Editor Settings.");
_get_blender_version(blender_path, blender_major_version, blender_minor_version, nullptr); ERR_FAIL_COND_V_MSG(!FileAccess::exists(blender_path), nullptr, vformat("Invalid Blender path: %s, check your Editor Settings.", blender_path));
if (blender_major_version == -1 || blender_minor_version == -1 || last_tested_blender_path != blender_path) {
String error;
if (!_get_blender_version(blender_path, blender_major_version, blender_minor_version, &error)) {
ERR_FAIL_V_MSG(nullptr, error);
}
last_tested_blender_path = blender_path;
} }
// Get global paths for source and sink. // Get global paths for source and sink.

1
modules/gltf/editor/editor_scene_importer_blend.h
View File

@ -45,6 +45,7 @@ class EditorSceneFormatImporterBlend : public EditorSceneFormatImporter {
int blender_major_version = -1; int blender_major_version = -1;
int blender_minor_version = -1; int blender_minor_version = -1;
String last_tested_blender_path;
public: public:
enum { enum {