diff options
author | Cedric BAIL <cedric@osg.samsung.com> | 2015-04-03 16:23:04 +0200 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2015-04-03 16:23:04 +0200 |
commit | 5aafae94f171bd47f735fea234219c5217be84f7 (patch) | |
tree | 43ace290181a9fe0b54c9dfc2d9fdbe1d9230c19 /src/lib/evas/canvas/evas_vg_shape.c | |
parent | 502ac459162589e95c57fa0ede376159044d4278 (diff) |
evas: actually we want the Ector_Renderer, not the Evas_VG_Node.
Diffstat (limited to 'src/lib/evas/canvas/evas_vg_shape.c')
-rw-r--r-- | src/lib/evas/canvas/evas_vg_shape.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c index 49eac2d..797712a 100644 --- a/src/lib/evas/canvas/evas_vg_shape.c +++ b/src/lib/evas/canvas/evas_vg_shape.c | |||
@@ -238,12 +238,13 @@ _evas_vg_shape_render_pre(Eo *obj EINA_UNUSED, | |||
238 | Evas_VG_Node_Data *nd) | 238 | Evas_VG_Node_Data *nd) |
239 | { | 239 | { |
240 | Evas_VG_Shape_Data *pd = data; | 240 | Evas_VG_Shape_Data *pd = data; |
241 | Evas_VG_Node_Data *fill, *stroke_fill, *stroke_marker, *mask; | ||
241 | EVAS_VG_COMPUTE_MATRIX(current, parent, nd); | 242 | EVAS_VG_COMPUTE_MATRIX(current, parent, nd); |
242 | 243 | ||
243 | _evas_vg_render_pre(pd->fill, s, current); | 244 | fill = _evas_vg_render_pre(pd->fill, s, current); |
244 | _evas_vg_render_pre(pd->stroke.fill, s, current); | 245 | stroke_fill = _evas_vg_render_pre(pd->stroke.fill, s, current); |
245 | _evas_vg_render_pre(pd->stroke.marker, s, current); | 246 | stroke_marker = _evas_vg_render_pre(pd->stroke.marker, s, current); |
246 | _evas_vg_render_pre(nd->mask, s, current); | 247 | mask = _evas_vg_render_pre(nd->mask, s, current); |
247 | 248 | ||
248 | if (!nd->renderer) | 249 | if (!nd->renderer) |
249 | { | 250 | { |
@@ -255,10 +256,10 @@ _evas_vg_shape_render_pre(Eo *obj EINA_UNUSED, | |||
255 | ector_renderer_origin_set(nd->x, nd->y), | 256 | ector_renderer_origin_set(nd->x, nd->y), |
256 | ector_renderer_color_set(nd->r, nd->g, nd->b, nd->a), | 257 | ector_renderer_color_set(nd->r, nd->g, nd->b, nd->a), |
257 | ector_renderer_visibility_set(nd->visibility), | 258 | ector_renderer_visibility_set(nd->visibility), |
258 | ector_renderer_mask_set(nd->mask), | 259 | ector_renderer_mask_set(mask->renderer), |
259 | ector_renderer_shape_fill_set(pd->fill), | 260 | ector_renderer_shape_fill_set(fill->renderer), |
260 | ector_renderer_shape_stroke_fill_set(pd->stroke.fill), | 261 | ector_renderer_shape_stroke_fill_set(stroke_fill->renderer), |
261 | ector_renderer_shape_stroke_marker_set(pd->stroke.marker), | 262 | ector_renderer_shape_stroke_marker_set(stroke_marker->renderer), |
262 | efl_graphics_shape_stroke_scale_set(pd->stroke.scale), | 263 | efl_graphics_shape_stroke_scale_set(pd->stroke.scale), |
263 | efl_graphics_shape_stroke_color_set(pd->stroke.r, | 264 | efl_graphics_shape_stroke_color_set(pd->stroke.r, |
264 | pd->stroke.g, | 265 | pd->stroke.g, |