diff options
author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-01-26 14:33:52 -0500 |
---|---|---|
committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-01-26 15:03:39 -0500 |
commit | 0b99f4ee05e7dc48f75d8362f340d8c13b6319ca (patch) | |
tree | 42300850df7a1dd142cae03fd3bd6cb45e1ab63d | |
parent | 686b10df5523f30765173c2392bda77155496b50 (diff) |
Revert "efl - edje_cc - fix default state checks in previous commit"
This reverts commit 82014cad2c11b40e455e0578d22f09b04ebd1e5c.
-rw-r--r-- | src/bin/edje/edje_cc_handlers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index df2b1d2a95..dfb8ed48de 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) | |||
6478 | if (ep->other.desc_count) ed = ep->other.desc[ep->other.desc_count - 1]; | 6478 | if (ep->other.desc_count) ed = ep->other.desc[ep->other.desc_count - 1]; |
6479 | 6479 | ||
6480 | s = parse_str(0); | 6480 | s = parse_str(0); |
6481 | if ((!current_group_inherit) && (!strcmp(s, "default"))) | 6481 | if (!strcmp(s, "default")) |
6482 | { | 6482 | { |
6483 | double v; | 6483 | double v; |
6484 | 6484 | ||
@@ -6500,7 +6500,7 @@ st_collections_group_parts_part_description_state(void) | |||
6500 | file_in, line - 1, s); | 6500 | file_in, line - 1, s); |
6501 | exit(-1); | 6501 | exit(-1); |
6502 | } | 6502 | } |
6503 | if ((!current_group_inherit) && (ed == ep->default_desc)) | 6503 | if (ed == ep->default_desc) |
6504 | { | 6504 | { |
6505 | if (strcmp(s, "default")) | 6505 | if (strcmp(s, "default")) |
6506 | { | 6506 | { |