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

Merge pull request #18219 from AlexHolly/fix-image-blit-blend 

blit and blend fix when dst<Vector2
This commit is contained in:
Juan Linietsky 2018-05-07 15:23:54 -03:00 committed by GitHub
parent 0db4c576f1 7cfdffcdf8
commit e6b938ef16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/image.cpp
View File

@ -1628,6 +1628,12 @@ void Image::blit_rect(const Ref<Image> &p_src, const Rect2 &p_src_rect, const Po
ERR_FAIL_COND(format != p_src->format);
Rect2i clipped_src_rect = Rect2i(0, 0, p_src->width, p_src->height).clip(p_src_rect);
if (p_dest.x < 0)
clipped_src_rect.position.x = ABS(p_dest.x);
if (p_dest.y < 0)
clipped_src_rect.position.y = ABS(p_dest.y);
if (clipped_src_rect.size.x <= 0 || clipped_src_rect.size.y <= 0)
return;
@ -1676,6 +1682,12 @@ void Image::blit_rect_mask(const Ref<Image> &p_src, const Ref<Image> &p_mask, co
ERR_FAIL_COND(format != p_src->format);
Rect2i clipped_src_rect = Rect2i(0, 0, p_src->width, p_src->height).clip(p_src_rect);
if (p_dest.x < 0)
clipped_src_rect.position.x = ABS(p_dest.x);
if (p_dest.y < 0)
clipped_src_rect.position.y = ABS(p_dest.y);
if (clipped_src_rect.size.x <= 0 || clipped_src_rect.size.y <= 0)
return;
@ -1727,6 +1739,12 @@ void Image::blend_rect(const Ref<Image> &p_src, const Rect2 &p_src_rect, const P
ERR_FAIL_COND(format != p_src->format);
Rect2i clipped_src_rect = Rect2i(0, 0, p_src->width, p_src->height).clip(p_src_rect);
if (p_dest.x < 0)
clipped_src_rect.position.x = ABS(p_dest.x);
if (p_dest.y < 0)
clipped_src_rect.position.y = ABS(p_dest.y);
if (clipped_src_rect.size.x <= 0 || clipped_src_rect.size.y <= 0)
return;
@ -1775,6 +1793,12 @@ void Image::blend_rect_mask(const Ref<Image> &p_src, const Ref<Image> &p_mask, c
ERR_FAIL_COND(format != p_src->format);
Rect2i clipped_src_rect = Rect2i(0, 0, p_src->width, p_src->height).clip(p_src_rect);
if (p_dest.x < 0)
clipped_src_rect.position.x = ABS(p_dest.x);
if (p_dest.y < 0)
clipped_src_rect.position.y = ABS(p_dest.y);
if (clipped_src_rect.size.x <= 0 || clipped_src_rect.size.y <= 0)
return;