asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #95505 from lyuma/import_null_external_animation_library

Browse source 
Avoid `[]` for `external_animation_library` import option
This commit is contained in:
Rémi Verschelde 2024-08-16 14:35:20 +02:00
commit 5847d362de
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
editor/import/3d/scene_import_settings.cpp
View file

@ -117,7 +117,9 @@ class SceneImportSettingsData : public Object {
ERR_FAIL_NULL(settings);
if (r_option.name == "rest_pose/load_pose") {
if (!settings->has("rest_pose/load_pose") || int((*settings)["rest_pose/load_pose"]) != 2) {
(*settings)["rest_pose/external_animation_library"] = Variant();
if (settings->has("rest_pose/external_animation_library")) {
(*settings)["rest_pose/external_animation_library"] = Variant();
}
}
}
if (r_option.name == "rest_pose/selected_animation") {
@ -134,7 +136,10 @@ class SceneImportSettingsData : public Object {
}
} break;
case 2: {
Object *res = (*settings)["rest_pose/external_animation_library"];
Object *res = nullptr;
if (settings->has("rest_pose/external_animation_library")) {
res = (*settings)["rest_pose/external_animation_library"];
}
Ref<Animation> anim(res);
Ref<AnimationLibrary> library(res);
if (anim.is_valid()) {