diff options
Diffstat (limited to 'src/modules/evas')
28 files changed, 93 insertions, 93 deletions
diff --git a/src/modules/evas/engines/buffer/evas_engine.c b/src/modules/evas/engines/buffer/evas_engine.c index 21dff7d753..791be8b9d3 100644 --- a/src/modules/evas/engines/buffer/evas_engine.c +++ b/src/modules/evas/engines/buffer/evas_engine.c @@ -136,7 +136,7 @@ eng_info_free(Evas *eo_e EINA_UNUSED, void *info) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Render_Engine *re; Evas_Engine_Info_Buffer *info; diff --git a/src/modules/evas/engines/drm/evas_engine.c b/src/modules/evas/engines/drm/evas_engine.c index e3cd01e576..6aecbc6c25 100644 --- a/src/modules/evas/engines/drm/evas_engine.c +++ b/src/modules/evas/engines/drm/evas_engine.c @@ -80,7 +80,7 @@ eng_setup(Evas *evas, void *einfo) info = (Evas_Engine_Info_Drm *)einfo; if (!info) return 0; - epd = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); + epd = efl_data_scope_get(evas, EVAS_CANVAS_CLASS); if (!epd) return 0; re = epd->engine.data.output; diff --git a/src/modules/evas/engines/eglfs/evas_engine.c b/src/modules/evas/engines/eglfs/evas_engine.c index 648b54f89a..50fe3fb8c9 100644 --- a/src/modules/evas/engines/eglfs/evas_engine.c +++ b/src/modules/evas/engines/eglfs/evas_engine.c @@ -703,7 +703,7 @@ eng_setup(Evas *evas, void *in) if (!(info = (Evas_Engine_Info_Eglfs *)in)) return 0; /* try to get the evas public data */ - if (!(epd = eo_data_scope_get(evas, EVAS_CANVAS_CLASS))) return 0; + if (!(epd = efl_data_scope_get(evas, EVAS_CANVAS_CLASS))) return 0; s = getenv("EVAS_GL_SWAP_MODE"); if (s) diff --git a/src/modules/evas/engines/fb/evas_engine.c b/src/modules/evas/engines/fb/evas_engine.c index 36d651526f..8de58080d3 100644 --- a/src/modules/evas/engines/fb/evas_engine.c +++ b/src/modules/evas/engines/fb/evas_engine.c @@ -91,7 +91,7 @@ eng_info_free(Evas *eo_e EINA_UNUSED, void *info) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Render_Engine *re; Evas_Engine_Info_FB *info; diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c b/src/modules/evas/engines/gl_cocoa/evas_engine.c index 1cd81c784f..224a59297f 100644 --- a/src/modules/evas/engines/gl_cocoa/evas_engine.c +++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c @@ -90,7 +90,7 @@ eng_info_free(Evas *e EINA_UNUSED, void *info) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Render_Engine *re; Evas_Engine_Info_GL_Cocoa *info; diff --git a/src/modules/evas/engines/gl_common/evas_gl_3d.c b/src/modules/evas/engines/gl_common/evas_gl_3d.c index bb99434133..83cc0738ee 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_3d.c +++ b/src/modules/evas/engines/gl_common/evas_gl_3d.c @@ -22,7 +22,7 @@ while (eina_iterator_next(it, &ptr)) \ { \ Evas_Canvas3D_Node_Mesh *nm = (Evas_Canvas3D_Node_Mesh *)ptr; \ - Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(nm->mesh, EVAS_CANVAS3D_MESH_CLASS); \ + Evas_Canvas3D_Mesh_Data *pdmesh = efl_data_scope_get(nm->mesh, EVAS_CANVAS3D_MESH_CLASS); \ CHECK_LOD_DISTANCE #define RENDER_MESH_NODE_ITERATE_END \ @@ -488,7 +488,7 @@ _mesh_frame_find(Evas_Canvas3D_Mesh *mesh, int frame, { Eina_List *left, *right; Evas_Canvas3D_Mesh_Frame *f0 = NULL, *f1; - Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); + Evas_Canvas3D_Mesh_Data *pdmesh = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); left = pdmesh->frames; right = eina_list_next(left); @@ -718,7 +718,7 @@ _material_color_build(E3D_Draw_Data *data, int frame, if (f0->material) { - Evas_Canvas3D_Material_Data *pdm = eo_data_scope_get(f0->material, EVAS_CANVAS3D_MATERIAL_CLASS); + Evas_Canvas3D_Material_Data *pdm = efl_data_scope_get(f0->material, EVAS_CANVAS3D_MATERIAL_CLASS); if (pdm->attribs[attrib].enable) break; } @@ -733,7 +733,7 @@ _material_color_build(E3D_Draw_Data *data, int frame, if (f1->material) { - Evas_Canvas3D_Material_Data *pdm = eo_data_scope_get(f1->material, EVAS_CANVAS3D_MATERIAL_CLASS); + Evas_Canvas3D_Material_Data *pdm = efl_data_scope_get(f1->material, EVAS_CANVAS3D_MATERIAL_CLASS); if (pdm->attribs[attrib].enable) break; } @@ -762,7 +762,7 @@ _material_color_build(E3D_Draw_Data *data, int frame, f1 = NULL; } } - Evas_Canvas3D_Material_Data *pdmf0 = eo_data_scope_get(f0->material, EVAS_CANVAS3D_MATERIAL_CLASS); + Evas_Canvas3D_Material_Data *pdmf0 = efl_data_scope_get(f0->material, EVAS_CANVAS3D_MATERIAL_CLASS); if (f1 == NULL) { data->materials[attrib].color = pdmf0->attribs[attrib].color; @@ -773,7 +773,7 @@ _material_color_build(E3D_Draw_Data *data, int frame, else { Evas_Real weight; - Evas_Canvas3D_Material_Data *pdmf1 = eo_data_scope_get(f1->material, EVAS_CANVAS3D_MATERIAL_CLASS); + Evas_Canvas3D_Material_Data *pdmf1 = efl_data_scope_get(f1->material, EVAS_CANVAS3D_MATERIAL_CLASS); weight = (f1->frame - frame) / (Evas_Real)(f1->frame - f0->frame); evas_color_blend(&data->materials[attrib].color, @@ -805,7 +805,7 @@ _material_texture_build(E3D_Draw_Data *data, int frame, if (f0->material) { - Evas_Canvas3D_Material_Data *pdm = eo_data_scope_get(f0->material, EVAS_CANVAS3D_MATERIAL_CLASS); + Evas_Canvas3D_Material_Data *pdm = efl_data_scope_get(f0->material, EVAS_CANVAS3D_MATERIAL_CLASS); if (pdm->attribs[attrib].enable && pdm->attribs[attrib].texture != NULL) break; } @@ -820,7 +820,7 @@ _material_texture_build(E3D_Draw_Data *data, int frame, if (f1->material) { - Evas_Canvas3D_Material_Data *pdm = eo_data_scope_get(f1->material, EVAS_CANVAS3D_MATERIAL_CLASS); + Evas_Canvas3D_Material_Data *pdm = efl_data_scope_get(f1->material, EVAS_CANVAS3D_MATERIAL_CLASS); if (pdm->attribs[attrib].enable && pdm->attribs[attrib].texture != NULL) break; } @@ -850,18 +850,18 @@ _material_texture_build(E3D_Draw_Data *data, int frame, } } - Evas_Canvas3D_Material_Data *pdmf0 = eo_data_scope_get(f0->material, EVAS_CANVAS3D_MATERIAL_CLASS); + Evas_Canvas3D_Material_Data *pdmf0 = efl_data_scope_get(f0->material, EVAS_CANVAS3D_MATERIAL_CLASS); data->materials[attrib].sampler0 = data->texture_count++; - Evas_Canvas3D_Texture_Data *pd = eo_data_scope_get(pdmf0->attribs[attrib].texture, EVAS_CANVAS3D_TEXTURE_CLASS); + Evas_Canvas3D_Texture_Data *pd = efl_data_scope_get(pdmf0->attribs[attrib].texture, EVAS_CANVAS3D_TEXTURE_CLASS); data->materials[attrib].tex0 = (E3D_Texture *)pd->engine_data; if (f1) { - Evas_Canvas3D_Material_Data *pdmf1 = eo_data_scope_get(f1->material, EVAS_CANVAS3D_MATERIAL_CLASS); + Evas_Canvas3D_Material_Data *pdmf1 = efl_data_scope_get(f1->material, EVAS_CANVAS3D_MATERIAL_CLASS); Evas_Real weight = (f1->frame - frame) / (Evas_Real)(f1->frame - f0->frame); data->materials[attrib].sampler1 = data->texture_count++; - pd = eo_data_scope_get(pdmf1->attribs[attrib].texture, EVAS_CANVAS3D_TEXTURE_CLASS); + pd = efl_data_scope_get(pdmf1->attribs[attrib].texture, EVAS_CANVAS3D_TEXTURE_CLASS); data->materials[attrib].tex1 = (E3D_Texture *)pd->engine_data; data->materials[attrib].texture_weight = weight; @@ -890,9 +890,9 @@ _light_build(E3D_Draw_Data *data, const Evas_Canvas3D_Node *light, const Eina_Matrix4 *matrix_eye) { - Evas_Canvas3D_Node_Data *pd_light_node = eo_data_scope_get(light, EVAS_CANVAS3D_NODE_CLASS); + Evas_Canvas3D_Node_Data *pd_light_node = efl_data_scope_get(light, EVAS_CANVAS3D_NODE_CLASS); Evas_Canvas3D_Light *l = pd_light_node ? pd_light_node->data.light.light : NULL; - Evas_Canvas3D_Light_Data *pdl = l ? eo_data_scope_get(l, EVAS_CANVAS3D_LIGHT_CLASS) : NULL; + Evas_Canvas3D_Light_Data *pdl = l ? efl_data_scope_get(l, EVAS_CANVAS3D_LIGHT_CLASS) : NULL; Eina_Vector3 pos, dir; if (pdl == NULL) @@ -963,7 +963,7 @@ _mesh_draw_data_build(E3D_Draw_Data *data, const Evas_Canvas3D_Node *light) { Eina_List *l, *r; - Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); + Evas_Canvas3D_Mesh_Data *pdmesh = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); if (pdmesh->frames == NULL) return EINA_FALSE; @@ -1169,8 +1169,8 @@ void _shadowmap_render(E3D_Drawable *drawable, E3D_Renderer *renderer, e3d_renderer_clear(renderer, &c); - Evas_Canvas3D_Node_Data *pd_light_node = eo_data_scope_get(light, EVAS_CANVAS3D_NODE_CLASS); - Evas_Canvas3D_Light_Data *pd = eo_data_scope_get(pd_light_node->data.light.light, + Evas_Canvas3D_Node_Data *pd_light_node = efl_data_scope_get(light, EVAS_CANVAS3D_NODE_CLASS); + Evas_Canvas3D_Light_Data *pd = efl_data_scope_get(pd_light_node->data.light.light, EVAS_CANVAS3D_LIGHT_CLASS); Eina_Quaternion planes[6]; @@ -1179,7 +1179,7 @@ void _shadowmap_render(E3D_Drawable *drawable, E3D_Renderer *renderer, EINA_LIST_FOREACH(data->mesh_nodes, l, n) { - Evas_Canvas3D_Node_Data *pd_mesh_node = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS); + Evas_Canvas3D_Node_Data *pd_mesh_node = efl_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS); if (evas_is_sphere_in_frustum(&pd_mesh_node->bsphere, planes)) { @@ -1227,19 +1227,19 @@ _scene_render(E3D_Drawable *drawable, E3D_Renderer *renderer, Evas_Canvas3D_Scen Eina_Quaternion planes[6]; /* Get eye matrix. */ - Evas_Canvas3D_Node_Data *pd_camera_node = eo_data_scope_get(data->camera_node, EVAS_CANVAS3D_NODE_CLASS); + Evas_Canvas3D_Node_Data *pd_camera_node = efl_data_scope_get(data->camera_node, EVAS_CANVAS3D_NODE_CLASS); matrix_eye = &pd_camera_node->data.camera.matrix_world_to_eye; - Evas_Canvas3D_Camera_Data *pd = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS); + Evas_Canvas3D_Camera_Data *pd = efl_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS); light = eina_list_data_get(data->light_nodes); if (data->shadows_enabled) { - pd_light_node = eo_data_scope_get(light, EVAS_CANVAS3D_NODE_CLASS); + pd_light_node = efl_data_scope_get(light, EVAS_CANVAS3D_NODE_CLASS); evas_mat4_inverse_build(&matrix_light_eye, &pd_light_node->position_world, &pd_light_node->orientation_world, &pd_light_node->scale_world); - ld = eo_data_scope_get(pd_light_node->data.light.light, EVAS_CANVAS3D_LIGHT_CLASS); + ld = efl_data_scope_get(pd_light_node->data.light.light, EVAS_CANVAS3D_LIGHT_CLASS); _shadowmap_render(drawable, renderer, data, &matrix_light_eye, light); } @@ -1253,7 +1253,7 @@ _scene_render(E3D_Drawable *drawable, E3D_Renderer *renderer, Evas_Canvas3D_Scen Eina_Matrix4 matrix_mvp; Eina_Iterator *it; void *ptr; - Evas_Canvas3D_Node_Data *pd_mesh_node = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS); + Evas_Canvas3D_Node_Data *pd_mesh_node = efl_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS); // TODO Add other frustum shapes if (evas_is_sphere_in_frustum(&pd_mesh_node->bsphere, planes)) @@ -1275,7 +1275,7 @@ _scene_render(E3D_Drawable *drawable, E3D_Renderer *renderer, Evas_Canvas3D_Scen while (eina_iterator_next(it, &ptr)) { Evas_Canvas3D_Node_Mesh *nm = (Evas_Canvas3D_Node_Mesh *)ptr; - Evas_Canvas3D_Mesh_Data *pdmesh = eo_data_scope_get(nm->mesh, EVAS_CANVAS3D_MESH_CLASS); + Evas_Canvas3D_Mesh_Data *pdmesh = efl_data_scope_get(nm->mesh, EVAS_CANVAS3D_MESH_CLASS); /*In case LOD enable pass in render only LOD meshes in dependences of the distance to the camera node: near_boundary <= distance <= far_boundary*/ @@ -1363,9 +1363,9 @@ e3d_drawable_scene_render_to_texture(E3D_Drawable *drawable, E3D_Renderer *rende if (data->color_pick_enabled) //Use rendering to texture in color pick mechanism { - Evas_Canvas3D_Node_Data *pd_camera_node = eo_data_scope_get(data->camera_node, EVAS_CANVAS3D_NODE_CLASS); + Evas_Canvas3D_Node_Data *pd_camera_node = efl_data_scope_get(data->camera_node, EVAS_CANVAS3D_NODE_CLASS); matrix_eye = &pd_camera_node->data.camera.matrix_world_to_eye; - Evas_Canvas3D_Camera_Data *pd = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS); + Evas_Canvas3D_Camera_Data *pd = efl_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS); itmn = eina_hash_iterator_data_new(data->colors_node_mesh); @@ -1386,7 +1386,7 @@ e3d_drawable_scene_render_to_texture(E3D_Drawable *drawable, E3D_Renderer *rende else repeat_node = eina_list_append(repeat_node, (void *)n); } - Evas_Canvas3D_Node_Data *pd_mesh_node = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS); + Evas_Canvas3D_Node_Data *pd_mesh_node = efl_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS); RENDER_MESH_NODE_ITERATE_BEGIN(eye) { if (pdmesh->color_pick_enabled) diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c index fc7524e0eb..1b424978c3 100644 --- a/src/modules/evas/engines/gl_drm/evas_engine.c +++ b/src/modules/evas/engines/gl_drm/evas_engine.c @@ -847,7 +847,7 @@ eng_setup(Evas *evas, void *in) if (!(info = (Evas_Engine_Info_GL_Drm *)in)) return 0; /* try to get the evas public data */ - if (!(epd = eo_data_scope_get(evas, EVAS_CANVAS_CLASS))) return 0; + if (!(epd = efl_data_scope_get(evas, EVAS_CANVAS_CLASS))) return 0; s = getenv("EVAS_GL_SWAP_MODE"); if (s) diff --git a/src/modules/evas/engines/gl_drm/evas_outbuf.c b/src/modules/evas/engines/gl_drm/evas_outbuf.c index cbeae57797..62c1fa3829 100644 --- a/src/modules/evas/engines/gl_drm/evas_outbuf.c +++ b/src/modules/evas/engines/gl_drm/evas_outbuf.c @@ -619,7 +619,7 @@ evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth) if (depth == OUTBUF_DEPTH_INHERIT) depth = ob->depth; - epd = eo_data_scope_get(ob->evas, EVAS_CANVAS_CLASS); + epd = efl_data_scope_get(ob->evas, EVAS_CANVAS_CLASS); EINA_SAFETY_ON_NULL_RETURN(epd); re = epd->engine.data.output; diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c index 930c236f42..4625071d8c 100644 --- a/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c +++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_image_buffer.c @@ -58,7 +58,7 @@ EOLIAN static void _evas_ector_gl_image_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd, Evas *evas, void *image) { - Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS); Evas_GL_Image *im = image; int l = 0, r = 0, t = 0, b = 0; @@ -68,7 +68,7 @@ _evas_ector_gl_image_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas_Ect return; } - pd->evas = eo_xref(evas, obj); + pd->evas = efl_xref(evas, obj); EINA_SAFETY_ON_NULL_RETURN(im); if (im->tex && im->tex->pt) @@ -134,7 +134,7 @@ _evas_ector_gl_image_buffer_ector_buffer_map(Eo *obj EINA_UNUSED, Evas_Ector_GL_ unsigned int x, unsigned int y, unsigned int w, unsigned int h, Efl_Gfx_Colorspace cspace, unsigned int *stride) { - Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(pd->evas, EVAS_CANVAS_CLASS); Ector_GL_Buffer_Map *map = NULL; Eina_Bool tofree = EINA_FALSE; Evas_GL_Image *im; @@ -188,7 +188,7 @@ EOLIAN static void _evas_ector_gl_image_buffer_ector_buffer_unmap(Eo *obj EINA_UNUSED, Evas_Ector_GL_Image_Buffer_Data *pd, void *data, unsigned int length) { - Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(pd->evas, EVAS_CANVAS_CLASS); Ector_GL_Buffer_Map *map; if (!data) return; @@ -233,9 +233,9 @@ _evas_ector_gl_image_buffer_ector_buffer_span_free(Eo *obj, Evas_Ector_GL_Image_ EOLIAN static Efl_Object * _evas_ector_gl_image_buffer_efl_object_constructor(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd) { - obj = efl_constructor(eo_super(obj, MY_CLASS)); - pd->base = eo_data_ref(obj, ECTOR_GL_BUFFER_BASE_MIXIN); - pd->base->generic = eo_data_ref(obj, ECTOR_BUFFER_MIXIN); + obj = efl_constructor(efl_super(obj, MY_CLASS)); + pd->base = efl_data_ref(obj, ECTOR_GL_BUFFER_BASE_MIXIN); + pd->base->generic = efl_data_ref(obj, ECTOR_BUFFER_MIXIN); pd->base->generic->eo = obj; return obj; } @@ -246,19 +246,19 @@ _evas_ector_gl_image_buffer_efl_object_finalize(Eo *obj, Evas_Ector_GL_Image_Buf EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL); pd->base->generic->immutable = EINA_TRUE; - return efl_finalize(eo_super(obj, MY_CLASS)); + return efl_finalize(efl_super(obj, MY_CLASS)); } EOLIAN static void _evas_ector_gl_image_buffer_efl_object_destructor(Eo *obj, Evas_Ector_GL_Image_Buffer_Data *pd) { - Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(pd->evas, EVAS_CANVAS_CLASS); - eo_data_unref(obj, pd->base->generic); - eo_data_unref(obj, pd->base); + efl_data_unref(obj, pd->base->generic); + efl_data_unref(obj, pd->base); ENFN->image_free(ENDT, pd->image); - eo_xunref(pd->evas, obj); - efl_destructor(eo_super(obj, MY_CLASS)); + efl_xunref(pd->evas, obj); + efl_destructor(efl_super(obj, MY_CLASS)); } #include "evas_ector_gl_image_buffer.eo.c" diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c index 90b79939a0..91bb22220d 100644 --- a/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c +++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c @@ -45,7 +45,7 @@ _evas_ector_gl_rgbaimage_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas return; } - pd->evas = eo_xref(evas, obj); + pd->evas = efl_xref(evas, obj); evas_cache_image_ref(&im->cache_entry); pd->image = im; @@ -57,7 +57,7 @@ _evas_ector_gl_rgbaimage_buffer_evas_ector_buffer_engine_image_get(Eo *obj EINA_ Evas_Ector_GL_RGBAImage_Buffer_Data *pd, Evas **evas, void **image) { - Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(pd->evas, EVAS_CANVAS_CLASS); Render_Engine_GL_Generic *re = e->engine.data.output; int err = EVAS_LOAD_ERROR_NONE; Evas_Engine_GL_Context *gc; @@ -88,8 +88,8 @@ end: EOLIAN static Eo * _evas_ector_gl_rgbaimage_buffer_efl_object_constructor(Eo *obj, Evas_Ector_GL_RGBAImage_Buffer_Data *pd) { - obj = efl_constructor(eo_super(obj, MY_CLASS)); - pd->base = eo_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj); + obj = efl_constructor(efl_super(obj, MY_CLASS)); + pd->base = efl_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj); return obj; } @@ -99,19 +99,19 @@ _evas_ector_gl_rgbaimage_buffer_efl_object_finalize(Eo *obj, Evas_Ector_GL_RGBAI EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL); pd->base->generic->immutable = EINA_TRUE; - return efl_finalize(eo_super(obj, MY_CLASS)); + return efl_finalize(efl_super(obj, MY_CLASS)); } EOLIAN static void _evas_ector_gl_rgbaimage_buffer_efl_object_destructor(Eo *obj, Evas_Ector_GL_RGBAImage_Buffer_Data *pd) { - Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(pd->evas, EVAS_CANVAS_CLASS); - eo_data_xunref(obj, pd->base, obj); + efl_data_xunref(obj, pd->base, obj); ENFN->image_free(ENDT, pd->glim); evas_cache_image_drop(&pd->image->cache_entry); - eo_xunref(pd->evas, obj); - efl_destructor(eo_super(obj, MY_CLASS)); + efl_xunref(pd->evas, obj); + efl_destructor(efl_super(obj, MY_CLASS)); } #include "evas_ector_gl_rgbaimage_buffer.eo.c" diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c index a241ea1e5d..6eab3848ff 100644 --- a/src/modules/evas/engines/gl_generic/evas_engine.c +++ b/src/modules/evas/engines/gl_generic/evas_engine.c @@ -2485,16 +2485,16 @@ eng_ector_create(void *data EINA_UNUSED) ector_backend = getenv("ECTOR_BACKEND"); if (ector_backend && !strcasecmp(ector_backend, "default")) { - ector = eo_add(ECTOR_SOFTWARE_SURFACE_CLASS, NULL); + ector = efl_add(ECTOR_SOFTWARE_SURFACE_CLASS, NULL); } else if (ector_backend && !strcasecmp(ector_backend, "experimental")) { - ector = eo_add(ECTOR_GL_SURFACE_CLASS, NULL); + ector = efl_add(ECTOR_GL_SURFACE_CLASS, NULL); use_gl = EINA_TRUE; } else { - ector = eo_add(ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL); + ector = efl_add(ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL); use_cairo = EINA_TRUE; } return ector; @@ -2515,13 +2515,13 @@ eng_ector_buffer_wrap(void *data EINA_UNUSED, Evas *evas, void *engine_image, Ei { RGBA_Image *im = engine_image; - buf = eo_add(EVAS_ECTOR_GL_RGBAIMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eo_self, evas, im)); + buf = efl_add(EVAS_ECTOR_GL_RGBAIMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(efl_self, evas, im)); } else { Evas_GL_Image *im = engine_image; - buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eo_self, evas, im)); + buf = efl_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(efl_self, evas, im)); } return buf; } @@ -2532,7 +2532,7 @@ eng_ector_buffer_new(void *data, Evas *evas, void *pixels, Efl_Gfx_Colorspace cspace, Eina_Bool writeable EINA_UNUSED, int l, int r, int t, int b, Ector_Buffer_Flag flags) { - Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(evas, EVAS_CANVAS_CLASS); Render_Engine_GL_Generic *re = e->engine.data.output; Evas_Engine_GL_Context *gc = NULL; Ector_Buffer *buf = NULL; @@ -2582,7 +2582,7 @@ eng_ector_buffer_new(void *data, Evas *evas, void *pixels, gc = re->window_gl_context_get(re->software.ob); im = evas_gl_common_image_surface_new(gc, iw, ih, EINA_TRUE); - buf = eo_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(eo_self, evas, im)); + buf = efl_add(EVAS_ECTOR_GL_IMAGE_BUFFER_CLASS, evas, evas_ector_buffer_engine_image_set(efl_self, evas, im)); im->references--; } return buf; diff --git a/src/modules/evas/engines/gl_sdl/evas_engine.c b/src/modules/evas/engines/gl_sdl/evas_engine.c index 99956ad0ce..5bb1acdb2f 100644 --- a/src/modules/evas/engines/gl_sdl/evas_engine.c +++ b/src/modules/evas/engines/gl_sdl/evas_engine.c @@ -289,7 +289,7 @@ eng_info_free(Evas *e EINA_UNUSED, void *info) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Render_Engine *re = NULL; Outbuf *ob = NULL; Evas_Engine_Info_GL_SDL *info; diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c index ddf1be64f8..99e867095a 100644 --- a/src/modules/evas/engines/gl_x11/evas_engine.c +++ b/src/modules/evas/engines/gl_x11/evas_engine.c @@ -1583,7 +1583,7 @@ _re_winfree(Render_Engine *re) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Render_Engine *re; Evas_Engine_Info_GL_X11 *info; Render_Engine_Swap_Mode swap_mode = MODE_FULL; diff --git a/src/modules/evas/engines/psl1ght/evas_engine.c b/src/modules/evas/engines/psl1ght/evas_engine.c index b87cf46d08..1d9ec1e96a 100644 --- a/src/modules/evas/engines/psl1ght/evas_engine.c +++ b/src/modules/evas/engines/psl1ght/evas_engine.c @@ -155,7 +155,7 @@ eng_info_free(Evas *e EINA_UNUSED, void *info) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Engine_Info_PSL1GHT *info; printf ("eng_setup called\n"); diff --git a/src/modules/evas/engines/software_ddraw/evas_engine.c b/src/modules/evas/engines/software_ddraw/evas_engine.c index 91b36d8494..3cf8f76f3e 100644 --- a/src/modules/evas/engines/software_ddraw/evas_engine.c +++ b/src/modules/evas/engines/software_ddraw/evas_engine.c @@ -91,7 +91,7 @@ eng_info_free(Evas *e EINA_UNUSED, void *info) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Render_Engine *re; Evas_Engine_Info_Software_DDraw *info; diff --git a/src/modules/evas/engines/software_gdi/evas_engine.c b/src/modules/evas/engines/software_gdi/evas_engine.c index e80a62903a..2135e122d6 100644 --- a/src/modules/evas/engines/software_gdi/evas_engine.c +++ b/src/modules/evas/engines/software_gdi/evas_engine.c @@ -94,7 +94,7 @@ eng_info_free(Evas *e EINA_UNUSED, void *info) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Render_Engine *re; Evas_Engine_Info_Software_Gdi *info; diff --git a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c index 1444c86b10..a6dc80e0d4 100644 --- a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c +++ b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c @@ -39,7 +39,7 @@ _evas_ector_software_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas_Ect return; } - pd->evas = eo_xref(evas, obj); + pd->evas = efl_xref(evas, obj); evas_cache_image_ref(&im->cache_entry); pd->image = im; @@ -51,7 +51,7 @@ _evas_ector_software_buffer_evas_ector_buffer_engine_image_get(Eo *obj EINA_UNUS Evas_Ector_Software_Buffer_Data *pd, Evas **evas, void **image) { - Evas_Public_Data *e = eo_data_scope_get(pd->evas, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(pd->evas, EVAS_CANVAS_CLASS); if (evas) *evas = pd->evas; if (e->engine.func->gl_surface_read_pixels) @@ -67,8 +67,8 @@ _evas_ector_software_buffer_evas_ector_buffer_engine_image_get(Eo *obj EINA_UNUS EOLIAN static Eo * _evas_ector_software_buffer_efl_object_constructor(Eo *obj, Evas_Ector_Software_Buffer_Data *pd) { - obj = efl_constructor(eo_super(obj, MY_CLASS)); - pd->base = eo_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj); + obj = efl_constructor(efl_super(obj, MY_CLASS)); + pd->base = efl_data_xref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN, obj); return obj; } @@ -78,16 +78,16 @@ _evas_ector_software_buffer_efl_object_finalize(Eo *obj, Evas_Ector_Software_Buf EINA_SAFETY_ON_NULL_RETURN_VAL(pd->base, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(pd->image, NULL); pd->base->generic->immutable = EINA_TRUE; - return efl_finalize(eo_super(obj, MY_CLASS)); + return efl_finalize(efl_super(obj, MY_CLASS)); } EOLIAN static void _evas_ector_software_buffer_efl_object_destructor(Eo *obj, Evas_Ector_Software_Buffer_Data *pd) { - eo_data_xunref(obj, pd->base, obj); + efl_data_xunref(obj, pd->base, obj); evas_cache_image_drop(&pd->image->cache_entry); - eo_xunref(pd->evas, obj); - efl_destructor(eo_super(obj, MY_CLASS)); + efl_xunref(pd->evas, obj); + efl_destructor(efl_super(obj, MY_CLASS)); } #include "evas_ector_buffer.eo.c" diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c index 25f34bf66f..628ae5ef52 100644 --- a/src/modules/evas/engines/software_generic/evas_engine.c +++ b/src/modules/evas/engines/software_generic/evas_engine.c @@ -4057,12 +4057,12 @@ eng_ector_create(void *data EINA_UNUSED) ector_backend = getenv("ECTOR_BACKEND"); if (ector_backend && !strcasecmp(ector_backend, "default")) { - ector = eo_add(ECTOR_SOFTWARE_SURFACE_CLASS, NULL); + ector = efl_add(ECTOR_SOFTWARE_SURFACE_CLASS, NULL); use_cairo = EINA_FALSE; } else { - ector = eo_add(ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL); + ector = efl_add(ECTOR_CAIRO_SOFTWARE_SURFACE_CLASS, NULL); use_cairo = EINA_TRUE; } return ector; @@ -4082,7 +4082,7 @@ eng_ector_buffer_wrap(void *data EINA_UNUSED, Evas *e, void *engine_image, Eina_ if (!ie) return NULL; - buf = eo_add(EVAS_ECTOR_SOFTWARE_BUFFER_CLASS, e, evas_ector_buffer_engine_image_set(eo_self, e, ie)); + buf = efl_add(EVAS_ECTOR_SOFTWARE_BUFFER_CLASS, e, evas_ector_buffer_engine_image_set(efl_self, e, ie)); return buf; } @@ -4101,7 +4101,7 @@ eng_ector_buffer_new(void *data EINA_UNUSED, Evas *evas, void *pixels, if ((flags & (ECTOR_BUFFER_FLAG_RENDERABLE | ECTOR_BUFFER_FLAG_DRAWABLE)) == 0) { - buf = eo_add(ECTOR_SOFTWARE_BUFFER_CLASS, evas, ector_buffer_pixels_set(eo_self, pixels, width, height, stride, cspace, writeable, l, r, t, b)); + buf = efl_add(ECTOR_SOFTWARE_BUFFER_CLASS, evas, ector_buffer_pixels_set(efl_self, pixels, width, height, stride, cspace, writeable, l, r, t, b)); } else { diff --git a/src/modules/evas/engines/software_x11/evas_engine.c b/src/modules/evas/engines/software_x11/evas_engine.c index fcb556bfb4..00691ae7cb 100644 --- a/src/modules/evas/engines/software_x11/evas_engine.c +++ b/src/modules/evas/engines/software_x11/evas_engine.c @@ -471,7 +471,7 @@ eng_info_free(Evas *eo_e EINA_UNUSED, void *info) static int eng_setup(Evas *eo_e, void *in) { - Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); + Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Engine_Info_Software_X11 *info; Render_Engine *re = NULL; diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c index 9fa52c4b48..c79bcf6e2a 100644 --- a/src/modules/evas/engines/wayland_egl/evas_engine.c +++ b/src/modules/evas/engines/wayland_egl/evas_engine.c @@ -535,7 +535,7 @@ eng_setup(Evas *evas, void *info) const char *s; inf = (Evas_Engine_Info_Wayland_Egl *)info; - epd = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); + epd = efl_data_scope_get(evas, EVAS_CANVAS_CLASS); if ((s = getenv("EVAS_GL_SWAP_MODE"))) { diff --git a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c index c713b622ed..f0dea421cc 100644 --- a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c @@ -382,7 +382,7 @@ _fallback(Dmabuf_Surface *s, int w, int h) if (!b->mapping) b->mapping = buffer_manager->map(b); if (!b->mapping) goto out; - epd = eo_data_scope_get(surf->info->evas, EVAS_CANVAS_CLASS); + epd = efl_data_scope_get(surf->info->evas, EVAS_CANVAS_CLASS); while (epd && epd->rendering) evas_async_events_process_blocking(); old_data = b->mapping; diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c index 561f9e90fb..4a5849feb8 100644 --- a/src/modules/evas/engines/wayland_shm/evas_engine.c +++ b/src/modules/evas/engines/wayland_shm/evas_engine.c @@ -144,7 +144,7 @@ eng_setup(Evas *eo_evas, void *info) return 0; /* try to get evas public data */ - if (!(epd = eo_data_scope_get(eo_evas, EVAS_CANVAS_CLASS))) + if (!(epd = efl_data_scope_get(eo_evas, EVAS_CANVAS_CLASS))) return 0; /* test for valid engine output */ diff --git a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c index b3ae3ba999..7ff40b9b25 100644 --- a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c +++ b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c @@ -63,9 +63,9 @@ static void _set_material_to_mesh_from_eet_file(Evas_Canvas3D_Mesh *mesh, Evas_Canvas3D_Mesh_Eet *eet_mesh) { - Evas_Canvas3D_Object_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_OBJECT_CLASS); + Evas_Canvas3D_Object_Data *pd = efl_data_scope_get(mesh, EVAS_CANVAS3D_OBJECT_CLASS); Eo *material = NULL; - material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, pd->evas); + material = efl_add(EVAS_CANVAS3D_MATERIAL_CLASS, pd->evas); evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, !!(eet_mesh->materials->colors[0].a > 0)); evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, !!(eet_mesh->materials->colors[1].a > 0)); diff --git a/src/modules/evas/model_loaders/md2/evas_model_load_md2.c b/src/modules/evas/model_loaders/md2/evas_model_load_md2.c index 02842adf7e..16dd330813 100644 --- a/src/modules/evas/model_loaders/md2/evas_model_load_md2.c +++ b/src/modules/evas/model_loaders/md2/evas_model_load_md2.c @@ -406,7 +406,7 @@ evas_model_load_file_md2(Evas_Canvas3D_Mesh *mesh, Eina_File *file) evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL); evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, f, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD); - pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); + pd = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); if (!evas_canvas3d_mesh_aabb_add_to_frame(pd, f, stride_pos)) { diff --git a/src/modules/evas/model_loaders/obj/evas_model_load_obj.c b/src/modules/evas/model_loaders/obj/evas_model_load_obj.c index 4f1c8f6e61..3ec4ed5274 100644 --- a/src/modules/evas/model_loaders/obj/evas_model_load_obj.c +++ b/src/modules/evas/model_loaders/obj/evas_model_load_obj.c @@ -444,7 +444,7 @@ evas_model_load_file_obj(Evas_Canvas3D_Mesh *mesh, Eina_File *file) if (counts.existence_of_tex_point) evas_canvas3d_mesh_frame_vertex_data_unmap(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD); - Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); + Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); if (!evas_canvas3d_mesh_aabb_add_to_frame(pd, 0, stride_pos)) { diff --git a/src/modules/evas/model_savers/eet/evas_model_save_eet.c b/src/modules/evas/model_savers/eet/evas_model_save_eet.c index 89c7c89d26..23b396db41 100644 --- a/src/modules/evas/model_savers/eet/evas_model_save_eet.c +++ b/src/modules/evas/model_savers/eet/evas_model_save_eet.c @@ -71,7 +71,7 @@ _set_material_to_eet_file_from_mesh(Evas_Canvas3D_Mesh_Eet *eet_mesh, { int i; Evas_Canvas3D_Material_Data *material = - eo_data_scope_get(f->material, EVAS_CANVAS3D_MATERIAL_CLASS); + efl_data_scope_get(f->material, EVAS_CANVAS3D_MATERIAL_CLASS); Evas_Canvas3D_Material_Eet *saved_materials = malloc(sizeof(Evas_Canvas3D_Material_Eet)); Evas_Canvas3D_Color_Eet *saved_colors = @@ -146,7 +146,7 @@ evas_model_save_file_eet(const Evas_Canvas3D_Mesh *mesh, const char *file, Evas_Canvas3D_Mesh_Frame *f) { - Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); + Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); Eet_File *ef; Evas_Canvas3D_Mesh_Eet* eet_mesh = malloc(sizeof(Evas_Canvas3D_Mesh_Eet)); Evas_Canvas3D_Header_Eet* eet_header = malloc(sizeof(Evas_Canvas3D_Header_Eet)); diff --git a/src/modules/evas/model_savers/obj/evas_model_save_obj.c b/src/modules/evas/model_savers/obj/evas_model_save_obj.c index 2b5db86800..7ecc4b7f75 100644 --- a/src/modules/evas/model_savers/obj/evas_model_save_obj.c +++ b/src/modules/evas/model_savers/obj/evas_model_save_obj.c @@ -234,8 +234,8 @@ evas_model_save_file_obj(const Evas_Canvas3D_Mesh *mesh, eina_str_join(_mtl_file_name, len + 1, '.', _without_extention, "mtl"); free(_without_extention); - Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); - mat = eo_data_scope_get(f->material, EVAS_CANVAS3D_MATERIAL_CLASS); + Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); + mat = efl_data_scope_get(f->material, EVAS_CANVAS3D_MATERIAL_CLASS); if (mat != NULL) _save_material(pd, _mtl_file_name, mat); _save_mesh(pd, _obj_file_name, _mtl_file_name, f); diff --git a/src/modules/evas/model_savers/ply/evas_model_save_ply.c b/src/modules/evas/model_savers/ply/evas_model_save_ply.c index 8da8f741ea..a805baaa05 100644 --- a/src/modules/evas/model_savers/ply/evas_model_save_ply.c +++ b/src/modules/evas/model_savers/ply/evas_model_save_ply.c @@ -71,7 +71,7 @@ evas_model_save_file_ply(const Evas_Canvas3D_Mesh *mesh, Evas_Model_Load_Save_Header header; Evas_Model_Load_Save_Data data; - Evas_Canvas3D_Mesh_Data *pd = eo_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); + Evas_Canvas3D_Mesh_Data *pd = efl_data_scope_get(mesh, EVAS_CANVAS3D_MESH_CLASS); if (!evas_model_save_header_from_mesh(pd, f, &header)) return; evas_model_save_data_from_mesh(pd, f, header, &data); |