rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=fe8373b5dc7c577f8376b64933b72357f9f0328f

commit fe8373b5dc7c577f8376b64933b72357f9f0328f
Author: Vitalii Vorobiov <vi.vorob...@samsung.com>
Date:   Mon Sep 19 19:21:39 2016 +0300

    resource_manager: correct work for tweens when state/part deleted and 
Ctrl-Z'ed
    
    @fix
---
 src/bin/editor/editor_states.c                    | 2 +-
 src/bin/resource_manager/resource_manager_build.c | 2 +-
 src/bin/resource_manager/resource_manager_react.c | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/bin/editor/editor_states.c b/src/bin/editor/editor_states.c
index 18e0339..dfec2f7 100644
--- a/src/bin/editor/editor_states.c
+++ b/src/bin/editor/editor_states.c
@@ -702,7 +702,7 @@ editor_state_reset(Evas_Object *edit_object, Change 
*change, Eina_Bool apply,
 
          tweens = edje_edit_state_tweens_list_get(edit_object, part_name, 
state_name, state_val);
          EINA_LIST_FOREACH(tweens, l, tween)
-            res = res && editor_state_tween_del(edit_object, change, apply, 
false, part_name, state_name, state_val, tween);
+            res = res && editor_state_tween_del(edit_object, change, false, 
apply, part_name, state_name, state_val, tween);
          edje_edit_string_list_free(tweens);
          break;
       case EDJE_PART_TYPE_PROXY:
diff --git a/src/bin/resource_manager/resource_manager_build.c 
b/src/bin/resource_manager/resource_manager_build.c
index 9821828..a0f2bce 100644
--- a/src/bin/resource_manager/resource_manager_build.c
+++ b/src/bin/resource_manager/resource_manager_build.c
@@ -99,7 +99,7 @@ _state_dependency_load(Project *pro, Group2 *group, Part2 
*part, State2 *state)
 
    if (part->type == EDJE_PART_TYPE_IMAGE)
      {
-        if (strcmp(state->normal, EFLETE_DUMMY_IMAGE_NAME))
+        if (state->normal && strcmp(state->normal, EFLETE_DUMMY_IMAGE_NAME))
           {
              if (edje_edit_image_set_exists(group->edit_object, state->normal))
                res = resource_manager_find(pro->RM.image_sets, state->normal);
diff --git a/src/bin/resource_manager/resource_manager_react.c 
b/src/bin/resource_manager/resource_manager_react.c
index 69f5d53..50ddaa7 100644
--- a/src/bin/resource_manager/resource_manager_react.c
+++ b/src/bin/resource_manager/resource_manager_react.c
@@ -317,10 +317,11 @@ _property_attribute_changed(void *data,
               _resource_usage_resource_del(state, old_source);
               ((State2 *)state)->tweens = eina_list_remove(((State2 
*)state)->tweens, old_source);
            }
-         TODO("Support some image sets here");
          if (change->value)
            {
               source = resource_manager_find(pro->RM.images, change->value);
+              if (!source)
+                source = resource_manager_find(pro->RM.image_sets, 
change->value);
               _resource_usage_resource_add(state, source);
               ((State2 *)state)->tweens = eina_list_append(((State2 
*)state)->tweens, source);
            }

-- 


Reply via email to