zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=fd48c95f4907958bf10a07b2506fc12749fc92fa
commit fd48c95f4907958bf10a07b2506fc12749fc92fa Author: Mike Blumenkrantz <zm...@samsung.com> Date: Thu May 30 13:15:51 2019 -0400 edje_cc: remove compile fails when setting a complex object as a clipper Summary: this is now supported Depends on D8852 Reviewers: cedric Reviewed By: cedric Subscribers: cedric Tags: #efl Differential Revision: https://phab.enlightenment.org/D8853 --- src/bin/edje/edje_cc_out.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c index 096631d5ec..8a3bcfb3e5 100644 --- a/src/bin/edje/edje_cc_out.c +++ b/src/bin/edje/edje_cc_out.c @@ -581,16 +581,6 @@ check_nameless_state(Edje_Part_Collection *pc, Edje_Part *ep, Edje_Part_Descript static void check_state(Edje_Part_Collection *pc, Edje_Part *ep, Edje_Part_Description_Common *ed, Eet_File *ef) { - /* FIXME: When smart masks are supported, remove this check */ - if (ed->clip_to_id != -1 && - (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_RECTANGLE) && - (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_IMAGE) && - (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_PROXY)) - error_and_abort(ef, "Collection %i: part: '%s' state: '%s' %g clip_to points to " - "a non RECT/IMAGE part '%s'!", - pc->id, ep->name, ed->state.name, ed->state.value, - pc->parts[ed->clip_to_id]->name); - check_nameless_state(pc, ep, ed, ef); } @@ -675,14 +665,6 @@ check_part(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef) default: break; } } - - /* FIXME: When smart masks are supported, remove this check */ - if (ep->clip_to_id != -1 && - (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_RECTANGLE) && - (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_IMAGE) && - (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_PROXY)) - error_and_abort(ef, "Collection %i: clip_to point to a non RECT/IMAGE part '%s' !", - pc->id, pc->parts[ep->clip_to_id]->name); } static void --