Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #92986 from Repiteo/core/ref-instantiate-integration

Browse source 
Core: Integrate Ref `instantiate` where possible
This commit is contained in:
Thaddeus Crews 2024-11-11 14:18:15 -06:00
commit 9be806aef1
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
44 changed files with 81 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

2
editor/import/3d/editor_import_collada.cpp
View file

@ -1263,7 +1263,7 @@ Error ColladaImport::_create_resources(Collada::Node *p_node, bool p_use_compres
//bleh, must ignore invalid
ERR_FAIL_COND_V(!collada.state.mesh_data_map.has(meshid), ERR_INVALID_DATA);
mesh = Ref<ImporterMesh>(memnew(ImporterMesh));
mesh.instantiate();
const Collada::MeshData &meshdata = collada.state.mesh_data_map[meshid];
String name = meshdata.name;
if (name.is_empty()) {

2
editor/import/3d/resource_importer_scene.cpp
View file

@ -3092,7 +3092,7 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p
if (!scr.is_valid()) {
EditorNode::add_io_error(TTR("Couldn't load post-import script:") + " " + post_import_script_path);
} else {
post_import_script = Ref<EditorScenePostImport>(memnew(EditorScenePostImport));
post_import_script.instantiate();
post_import_script->set_script(scr);
if (!post_import_script->get_script_instance()) {
EditorNode::add_io_error(TTR("Invalid/broken script for post-import (check console):") + " " + post_import_script_path);