From 703bb799b524d97250e35d96174377781f981cf6 Mon Sep 17 00:00:00 2001 From: Jiyoun Park Date: Sun, 21 Apr 2013 09:41:53 +0900 Subject: [PATCH] enable s/w native surface and fix bug reset engine data when native set called Change-Id: I565c32e846945cc620424c6f93fce8205995042d Conflicts: src/modules/engines/software_x11/evas_engine.c --- src/modules/engines/software_x11/evas_engine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/engines/software_x11/evas_engine.c b/src/modules/engines/software_x11/evas_engine.c index 050514d..58b284d 100644 --- a/src/modules/engines/software_x11/evas_engine.c +++ b/src/modules/engines/software_x11/evas_engine.c @@ -999,8 +999,8 @@ eng_image_native_set(void *data, void *image, void *native) RGBA_Image *im = image; Render_Engine *re = (Render_Engine *)data; - if (!im || !ns) return NULL; - if (ns->type != EVAS_NATIVE_SURFACE_X11) return NULL; + if (!im || !ns) return im; + if (ns->type != EVAS_NATIVE_SURFACE_X11) return im; #ifdef BUILD_ENGINE_SOFTWARE_XLIB return evas_xlib_image_native_set(re->ob, image, ns); #endif -- 2.7.4