diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-11 13:45:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 13:45:48 +0200 |
| commit | 32133a11b56761df99579ad96ee29a47d2aed6b4 (patch) | |
| tree | ab68992cfe6b1f59a618f713545fdcb3b6488b07 /editor/import/resource_importer_scene.cpp | |
| parent | bbdfc7353c3af72fcdf037ff10b8571aa2afc230 (diff) | |
| parent | 1bea8e1eacc68bcedbd3f207395bccf11011dae2 (diff) | |
Merge pull request #38386 from reduz/new-lightmapper
New GPU lightmapper
Diffstat (limited to 'editor/import/resource_importer_scene.cpp')
| -rw-r--r-- | editor/import/resource_importer_scene.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index e7f87acd03..b9341b1fb6 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -354,7 +354,7 @@ Node *ResourceImporterScene::_fix_node(Node *p_node, Node *p_root, Map<Ref<Mesh> if (p_light_bake_mode != LIGHT_BAKE_DISABLED) { - mi->set_flag(GeometryInstance3D::FLAG_USE_BAKED_LIGHT, true); + mi->set_gi_mode(GeometryInstance3D::GI_MODE_BAKED); } } @@ -955,7 +955,7 @@ void ResourceImporterScene::_find_meshes(Node *p_node, Map<Ref<ArrayMesh>, Trans Transform transform; while (s) { transform = transform * s->get_transform(); - s = s->get_parent_spatial(); + s = Object::cast_to<Node3D>(s->get_parent()); } meshes[mesh] = transform; @@ -1358,8 +1358,9 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p scene->set_script(Variant(root_script)); } + float root_scale = 1.0; if (Object::cast_to<Node3D>(scene)) { - float root_scale = p_options["nodes/root_scale"]; + root_scale = p_options["nodes/root_scale"]; Object::cast_to<Node3D>(scene)->scale(Vector3(root_scale, root_scale, root_scale)); } |