Merge pull request #111476 from kleonc/canvas_item_draw_set_transform_fix_rotation_scale_order

Repiteo · Repiteo · commit c6df8d32531f · 2025-10-13T19:28:55.000-05:00
Fix rotation/scale order in `CanvasItem::draw_set_transform`
diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp
@@ -947,8 +947,7 @@ void CanvasItem::draw_set_transform(const Point2 &p_offset, real_t p_rot, const
 	ERR_THREAD_GUARD;
 	ERR_DRAW_GUARD;
 
-	Transform2D xform(p_rot, p_offset);
-	xform.scale_basis(p_scale);
+	Transform2D xform(p_rot, p_scale, 0.0, p_offset);
 	RenderingServer::get_singleton()->canvas_item_add_set_transform(canvas_item, xform);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -947,8 +947,7 @@ void CanvasItem::draw_set_transform(const Point2 &p_offset, real_t p_rot, const`
`947`	`947`	`ERR_THREAD_GUARD;`
`948`	`948`	`ERR_DRAW_GUARD;`
`949`	`949`
`950`		`- Transform2D xform(p_rot, p_offset);`
`951`		`- xform.scale_basis(p_scale);`
	`950`	`+ Transform2D xform(p_rot, p_scale, 0.0, p_offset);`
`952`	`951`	`RenderingServer::get_singleton()->canvas_item_add_set_transform(canvas_item, xform);`
`953`	`952`	`}`
`954`	`953`