godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2572 from leezh/clipping-fix 

nested clipping of canvas items now works
This commit is contained in:
Juan Linietsky 2015-10-17 09:48:38 -03:00
parent f259f9cbc3 7f001a2c76
commit 652a01f16f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
servers/visual/visual_server_raster.cpp
View File

@ -6824,7 +6824,11 @@ void VisualServerRaster::_render_canvas_item(CanvasItem *p_canvas_item,const Mat
copymem(child_items,ci->child_items.ptr(),child_item_count*sizeof(CanvasItem*)); copymem(child_items,ci->child_items.ptr(),child_item_count*sizeof(CanvasItem*));
if (ci->clip) { if (ci->clip) {
ci->final_clip_rect=global_rect; if (p_canvas_clip != NULL) {
ci->final_clip_rect=p_canvas_clip->final_clip_rect.clip(global_rect);
} else {
ci->final_clip_rect=global_rect;
}
ci->final_clip_owner=ci; ci->final_clip_owner=ci;
} else { } else {