summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-11-02 12:23:00 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-11-02 13:40:00 +0900
commitb4fc15311c87250bf9b39ab9bbdedc02d32b2326 (patch)
tree2bf64b945c8a5a65f18c3efa14d5a8e26d79f60a
parent4da3e70301f00a7aecd24a952628e6eda3d2808a (diff)
Evas render: Fix 'no_render' when object is proxy source
When the no_render flag was set on a proxy source, the object would not be visible, but it would also not render inside the proxy surface, which completely beats the purpose of this flag. This patch makes the objects render inside a proxy surface.
-rw-r--r--src/lib/evas/canvas/evas_render.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 721a4204fe..9347189336 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1371,7 +1371,7 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object *eo_obj,
1371 else 1371 else
1372 { 1372 {
1373 /* can not trust cache.clip - evas is frozen */ 1373 /* can not trust cache.clip - evas is frozen */
1374 if (!obj->cur->visible || obj->clip.clipees || obj->no_render || 1374 if (!obj->cur->visible || obj->clip.clipees || (obj->no_render && !proxy_render_data) ||
1375 (!obj->cur->color.a && (obj->cur->render_op == EVAS_RENDER_BLEND))) 1375 (!obj->cur->color.a && (obj->cur->render_op == EVAS_RENDER_BLEND)))
1376 { 1376 {
1377 IFRD(obj->no_render, level, " proxy_src_clip + no_render\n"); 1377 IFRD(obj->no_render, level, " proxy_src_clip + no_render\n");