Ver código fonte

Merge pull request #67710 from KoBeWi/a_bit_local_global_transform

Remove error condition from get_global_transform()
Rémi Verschelde 2 anos atrás
pai
commit
71a6aba3d7
2 arquivos alterados com 1 adições e 4 exclusões
  1. 1 1
      doc/classes/CanvasItem.xml
  2. 0 3
      scene/main/canvas_item.cpp

+ 1 - 1
doc/classes/CanvasItem.xml

@@ -416,7 +416,7 @@
 		<method name="get_global_transform" qualifiers="const">
 			<return type="Transform2D" />
 			<description>
-				Returns the global transform matrix of this item.
+				Returns the global transform matrix of this item, i.e. the combined transform up to the topmost [CanvasItem] node. The topmost item is a [CanvasItem] that either has no parent, has non-[CanvasItem] parent or it has [member top_level] enabled.
 			</description>
 		</method>
 		<method name="get_global_transform_with_canvas" qualifiers="const">

+ 0 - 3
scene/main/canvas_item.cpp

@@ -168,9 +168,6 @@ Transform2D CanvasItem::get_screen_transform() const {
 }
 
 Transform2D CanvasItem::get_global_transform() const {
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_V(!is_inside_tree(), get_transform());
-#endif
 	if (global_invalid) {
 		const CanvasItem *pi = get_parent_item();
 		if (pi) {