hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fbf792896febc45a47951c033d7bbc7320b44160
commit fbf792896febc45a47951c033d7bbc7320b44160
Author: Hermet Park <hermetp...@gmail.com>
Date: Tue Feb 11 21:44:52 2020 +0900
canvas proxy: fix broken proxy source clip set behavior.
Some internal logic has been wrongly changed while it's on refactoring.
Fixed by reverting it.
---
src/lib/evas/canvas/evas_render.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/evas/canvas/evas_render.c
b/src/lib/evas/canvas/evas_render.c
index f5ebf9c2c1..27b3c52130 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -2156,7 +2156,7 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object
*eo_obj,
_evas_render_mapped_mask(evas, obj, obj->cur->clipper,
proxy_render_data, output, ctx, off_x, off_y, level, do_async);
else if (!proxy_src_clip && proxy_render_data)
{
- if (!_proxy_context_clip(evas, ctx, proxy_render_data,
proxy_render_data->proxy_obj, off_x, off_y))
+ if (!_proxy_context_clip(evas, ctx, proxy_render_data,
obj, off_x, off_y))
goto on_empty_clip;
}
@@ -2216,7 +2216,7 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object
*eo_obj,
}
else if (proxy_render_data)
{
- if (!_proxy_context_clip(evas, ctx,
proxy_render_data, proxy_render_data->proxy_obj, off_x, off_y))
+ if (!_proxy_context_clip(evas, ctx,
proxy_render_data, obj, off_x, off_y))
goto on_empty_clip;
}
}
@@ -2274,7 +2274,7 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object
*eo_obj,
}
else if (proxy_render_data)
{
- if (!_proxy_context_clip(evas, ctx, proxy_render_data,
proxy_render_data->proxy_obj, off_x, off_y))
+ if (!_proxy_context_clip(evas, ctx, proxy_render_data,
obj, off_x, off_y))
goto on_empty_clip;
}
}
--
