diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-10-21 16:05:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-21 16:05:21 +0200 |
| commit | 4a726998bd28121dde1d212f363d9eba7efa0caf (patch) | |
| tree | b8a496218ba7cd9e3a58ea45c98f0094c0f4a219 | |
| parent | f5dd4d574f5c69025c0bb9ae22dfe517f6cafe67 (diff) | |
| parent | 58e5c650d7ed83859fef81872074991811b0ec2e (diff) | |
Merge pull request #32865 from rodolforg/fix_32711-lookat-scaling-again
Spatial::look_at wrong re-scaling
| -rw-r--r-- | scene/3d/spatial.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scene/3d/spatial.cpp b/scene/3d/spatial.cpp index df831f92ef..9a659ef4af 100644 --- a/scene/3d/spatial.cpp +++ b/scene/3d/spatial.cpp @@ -690,11 +690,10 @@ void Spatial::look_at_from_position(const Vector3 &p_pos, const Vector3 &p_targe Transform lookat; lookat.origin = p_pos; - Vector3 original_scale(get_global_transform().basis.get_scale()); + Vector3 original_scale(get_scale()); lookat = lookat.looking_at(p_target, p_up); - // as basis was normalized, we just need to apply original scale back - lookat.basis.scale(original_scale); set_global_transform(lookat); + set_scale(original_scale); } Vector3 Spatial::to_local(Vector3 p_global) const { |