소스 검색

Merge pull request #79279 from kleonc/animation-fix-transform-subtracting

Fix `Animation::subtract_variant` for affine transforms
Yuri Sizov 2 년 전
부모
커밋
de14f09c1d
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      scene/resources/animation.cpp

+ 2 - 2
scene/resources/animation.cpp

@@ -5559,10 +5559,10 @@ Variant Animation::subtract_variant(const Variant &a, const Variant &b) {
 			return (b.operator Quaternion()).inverse() * (a.operator Quaternion());
 			return (b.operator Quaternion()).inverse() * (a.operator Quaternion());
 		}
 		}
 		case Variant::TRANSFORM2D: {
 		case Variant::TRANSFORM2D: {
-			return (b.operator Transform2D()).inverse() * (a.operator Transform2D());
+			return (b.operator Transform2D()).affine_inverse() * (a.operator Transform2D());
 		}
 		}
 		case Variant::TRANSFORM3D: {
 		case Variant::TRANSFORM3D: {
-			return (b.operator Transform3D()).inverse() * (a.operator Transform3D());
+			return (b.operator Transform3D()).affine_inverse() * (a.operator Transform3D());
 		}
 		}
 		default: {
 		default: {
 			return Variant::evaluate(Variant::OP_SUBTRACT, a, b);
 			return Variant::evaluate(Variant::OP_SUBTRACT, a, b);