discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0b99f4ee05e7dc48f75d8362f340d8c13b6319ca
commit 0b99f4ee05e7dc48f75d8362f340d8c13b6319ca Author: Mike Blumenkrantz <[email protected]> Date: Mon Jan 26 14:33:52 2015 -0500 Revert "efl - edje_cc - fix default state checks in previous commit" This reverts commit 82014cad2c11b40e455e0578d22f09b04ebd1e5c. --- src/bin/edje/edje_cc_handlers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index df2b1d2..dfb8ed4 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -6478,7 +6478,7 @@ st_collections_group_parts_part_description_state(void) if (ep->other.desc_count) ed = ep->other.desc[ep->other.desc_count - 1]; s = parse_str(0); - if ((!current_group_inherit) && (!strcmp(s, "default"))) + if (!strcmp(s, "default")) { double v; @@ -6500,7 +6500,7 @@ st_collections_group_parts_part_description_state(void) file_in, line - 1, s); exit(-1); } - if ((!current_group_inherit) && (ed == ep->default_desc)) + if (ed == ep->default_desc) { if (strcmp(s, "default")) { --
