diff options
author | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-03-14 14:06:24 +0900 |
---|---|---|
committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-03-14 14:15:09 +0900 |
commit | 3103c551f5e7622e47c4f4ea27a9012f86b8f127 (patch) | |
tree | 7922e4794f08c8d8346cc893ac3858bf63c034c1 /src/lib/edje/edje_calc.c | |
parent | fbe72f6e4bf3813a61fa166635cf5f048d318d08 (diff) |
edje: Move prev_description out of ephysics ifdef
prev_description was used when HAVE_EPHYSICS is set, which is the
default, but I also added a use in 7072fbc2bfe25881 where the map
was not properly reset.
This removes an ugly #ifdef and opens the door to other fixes
similar to that map one.
Diffstat (limited to '')
-rw-r--r-- | src/lib/edje/edje_calc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index 5bb2fbb50a..6f5e08c17d 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c | |||
@@ -5450,8 +5450,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta | |||
5450 | 5450 | ||
5451 | if (map_colors_free) _map_colors_free(pf); | 5451 | if (map_colors_free) _map_colors_free(pf); |
5452 | 5452 | ||
5453 | #ifdef HAVE_EPHYSICS | ||
5454 | ep->prev_description = chosen_desc; | 5453 | ep->prev_description = chosen_desc; |
5454 | #ifdef HAVE_EPHYSICS | ||
5455 | if (!ep->body) | 5455 | if (!ep->body) |
5456 | { | 5456 | { |
5457 | #endif | 5457 | #endif |
@@ -5461,7 +5461,6 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta | |||
5461 | ep->h = pf->final.h; | 5461 | ep->h = pf->final.h; |
5462 | #ifdef HAVE_EPHYSICS | 5462 | #ifdef HAVE_EPHYSICS |
5463 | } | 5463 | } |
5464 | |||
5465 | #endif | 5464 | #endif |
5466 | 5465 | ||
5467 | ep->calculated |= flags; | 5466 | ep->calculated |= flags; |