mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-11 22:35:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24037 from godotengine/revert-23976-transform_bug

Browse Source 
Revert "Construct Transform from Transform2D "
This commit is contained in:
Juan Linietsky 2018-11-28 15:16:18 +01:00 committed by GitHub
commit ba54d3e532
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/variant.cpp
View File

@ -1662,17 +1662,7 @@ Variant::operator Transform() const {
return Transform(*_data._basis, Vector3());
else if (type == QUAT)
return Transform(Basis(*reinterpret_cast<const Quat *>(_data._mem)), Vector3());
else if (type == TRANSFORM2D) {
const Transform2D &t = *_data._transform2d;
Transform m;
m.basis.elements[0][0] = t.elements[0][0];
m.basis.elements[1][0] = t.elements[1][0];
m.basis.elements[0][1] = t.elements[0][1];
m.basis.elements[1][1] = t.elements[1][1];
m.origin[0] = t.elements[2][0];
m.origin[1] = t.elements[2][1];
return m;
} else
else
return Transform();
}