diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-30 20:32:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-30 20:32:11 +0200 |
| commit | f3c74afd2869859fa117271264e9294d36be16e5 (patch) | |
| tree | 7533def8a2a7fd1a8b52b1fe965c318eb027e781 /editor/import | |
| parent | 6fed21c7cb85c4dd5842d8cb9fc268957a0429fd (diff) | |
| parent | eaaee63b629d6999fcc0c84e38886b964f6d051d (diff) | |
Merge pull request #37436 from akien-mga/doc-node-renames
doc: Update classref with node renames
Diffstat (limited to 'editor/import')
| -rw-r--r-- | editor/import/editor_import_collada.cpp | 2 | ||||
| -rw-r--r-- | editor/import/resource_importer_scene.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp index 6c089d7020..f16c3a9e68 100644 --- a/editor/import/editor_import_collada.cpp +++ b/editor/import/editor_import_collada.cpp @@ -318,7 +318,7 @@ Error ColladaImport::_create_scene(Collada::Node *p_node, Node3D *p_parent) { } else { //mesh since nothing else node = memnew(MeshInstance3D); - //Object::cast_to<MeshInstance>(node)->set_flag(GeometryInstance::FLAG_USE_BAKED_LIGHT, true); + //Object::cast_to<MeshInstance3D>(node)->set_flag(GeometryInstance3D::FLAG_USE_BAKED_LIGHT, true); } } break; case Collada::Node::TYPE_SKELETON: { diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index fb57773b18..7a1de78001 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -448,7 +448,7 @@ Node *ResourceImporterScene::_fix_node(Node *p_node, Node *p_root, Map<Ref<Mesh> } else if (empty_draw_type == "IMAGE") { WorldMarginShape3D *world_margin_shape = memnew(WorldMarginShape3D); colshape->set_shape(world_margin_shape); - colshape->set_name("WorldMarginShape"); + colshape->set_name("WorldMarginShape3D"); } else { SphereShape3D *sphereShape = memnew(SphereShape3D); sphereShape->set_radius(1); |