evas: Fixed invalid sanity check

Change-Id: I35f2674d5a29c52cba5540439ec92fb59829da7c

diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 908a810..37dc0f6 100755 (executable)
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -2195,8 +2195,6 @@ evas_object_image_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, v
 {
    Evas_Image_Data *o = type_private_data;
 
-   if (!obj->mask) return;
-
    /* image is not ready yet, skip rendering. Leave it to next frame */
    if (o->preload == EVAS_IMAGE_PRELOADING) return;
 
@@ -2211,7 +2209,7 @@ evas_object_image_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, v
      }
 
    /* Mask sanity */
-   if (obj->mask->is_mask && (surface != obj->mask->surface))
+   if (obj->mask && (obj->mask->is_mask && (surface != obj->mask->surface)))
      {
         ERR("Drawing a mask to another surface? Something's wrong...");
         return;

diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index efa7923..ee137a3 100644 (file)
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -405,9 +405,7 @@ _evas_mask_redraw_set(Evas_Public_Data *e EINA_UNUSED,
    Evas_Object_Protected_Data *clippee;
    Eina_List *l;
 
-   if (!obj->mask) return;
-
-   if (!(obj->mask->redraw))
+   if (!(obj->mask && obj->mask->redraw))
      {
         EINA_COW_WRITE_BEGIN(evas_object_mask_cow, obj->mask,
                              Evas_Object_Mask_Data, mask)