summaryrefslogtreecommitdiff
path: root/editor/import/scene_importer_mesh.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-06-03 23:07:21 +0200
committerGitHub <noreply@github.com>2021-06-03 23:07:21 +0200
commit5d9cab3aeb3c62df6b7b44e6e68c0ebbb67f7a45 (patch)
tree619055aeb386211fb83a7c861ab0f79a34aedb2d /editor/import/scene_importer_mesh.cpp
parentea2a0b54554c09999d74212925322e8c7b2437e0 (diff)
parent0ac4051c00898b316ae11e7075d3f3a9e3c46be3 (diff)
Merge pull request #38430 from aaronfranke/transform3d
Diffstat (limited to 'editor/import/scene_importer_mesh.cpp')
-rw-r--r--editor/import/scene_importer_mesh.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/import/scene_importer_mesh.cpp b/editor/import/scene_importer_mesh.cpp
index fa1a027a8d..bf17ea7bca 100644
--- a/editor/import/scene_importer_mesh.cpp
+++ b/editor/import/scene_importer_mesh.cpp
@@ -612,7 +612,7 @@ struct EditorSceneImporterMeshLightmapSurface {
String name;
};
-Error EditorSceneImporterMesh::lightmap_unwrap_cached(const Transform &p_base_transform, float p_texel_size, const Vector<uint8_t> &p_src_cache, Vector<uint8_t> &r_dst_cache) {
+Error EditorSceneImporterMesh::lightmap_unwrap_cached(const Transform3D &p_base_transform, float p_texel_size, const Vector<uint8_t> &p_src_cache, Vector<uint8_t> &r_dst_cache) {
ERR_FAIL_COND_V(!array_mesh_lightmap_unwrap_callback, ERR_UNCONFIGURED);
ERR_FAIL_COND_V_MSG(blend_shapes.size() != 0, ERR_UNAVAILABLE, "Can't unwrap mesh with blend shapes.");
@@ -628,7 +628,7 @@ Error EditorSceneImporterMesh::lightmap_unwrap_cached(const Transform &p_base_tr
Basis basis = p_base_transform.get_basis();
Vector3 scale = Vector3(basis.get_axis(0).length(), basis.get_axis(1).length(), basis.get_axis(2).length());
- Transform transform;
+ Transform3D transform;
transform.scale(scale);
Basis normal_basis = transform.basis.inverse().transposed();