diff options
| author | David Sichma <sichmada@gmail.com> | 2019-10-05 16:51:06 +0200 |
|---|---|---|
| committer | David Sichma <sichmada@gmail.com> | 2019-10-05 16:51:06 +0200 |
| commit | f73e1fae370f55774697ae0e3b30a97e0a8e78aa (patch) | |
| tree | 58af193be1f1af286d6fb727d5dd33ec66b21f38 | |
| parent | f9e9cc94cdfcf1bc1dd43e9d61e1394908835099 (diff) | |
Correctly flip texture src region
| -rw-r--r-- | scene/gui/item_list.cpp | 2 | ||||
| -rw-r--r-- | servers/visual/visual_server_canvas.cpp | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp index a3bc68ffcd..000b6e3bbb 100644 --- a/scene/gui/item_list.cpp +++ b/scene/gui/item_list.cpp @@ -925,7 +925,7 @@ void ItemList::_notification(int p_what) { current_columns = max_columns; while (true) { - //repeat util all fits + //repeat until all fits bool all_fit = true; Vector2 ofs; int col = 0; diff --git a/servers/visual/visual_server_canvas.cpp b/servers/visual/visual_server_canvas.cpp index f5a1276c27..ed06a67e4c 100644 --- a/servers/visual/visual_server_canvas.cpp +++ b/servers/visual/visual_server_canvas.cpp @@ -680,11 +680,22 @@ void VisualServerCanvas::canvas_item_add_texture_rect_region(RID p_item, const R rect->flags |= RasterizerCanvas::CANVAS_RECT_FLIP_H; rect->rect.size.x = -rect->rect.size.x; } + if (p_src_rect.size.x < 0) { + + rect->flags ^= RasterizerCanvas::CANVAS_RECT_FLIP_H; + rect->source.size.x = -rect->source.size.x; + } if (p_rect.size.y < 0) { rect->flags |= RasterizerCanvas::CANVAS_RECT_FLIP_V; rect->rect.size.y = -rect->rect.size.y; } + if (p_src_rect.size.y < 0) { + + rect->flags ^= RasterizerCanvas::CANVAS_RECT_FLIP_V; + rect->source.size.y = -rect->source.size.y; + } + if (p_transpose) { rect->flags |= RasterizerCanvas::CANVAS_RECT_TRANSPOSE; SWAP(rect->rect.size.x, rect->rect.size.y); |