raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6bf45900c835ba65a2e8c5d9c4bdcebfca875936
commit 6bf45900c835ba65a2e8c5d9c4bdcebfca875936
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Thu Jul 17 22:51:20 2014 +0900
more work on render2 - still not working with smart objects
---
src/lib/evas/canvas/evas_object_main.c | 1 -
src/lib/evas/canvas/evas_render2.c | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_main.c
b/src/lib/evas/canvas/evas_object_main.c
index d838b32..e8975c8 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -224,7 +224,6 @@ evas_object_change(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj)
obj->changed_move = EINA_FALSE;
}
-// if (obj->smart.smart) printf("change smart %p %i\n", obj, obj->changed);
if (obj->changed) return;
evas_render_object_recalc(eo_obj);
diff --git a/src/lib/evas/canvas/evas_render2.c
b/src/lib/evas/canvas/evas_render2.c
index 714ec52..8acdae8 100644
--- a/src/lib/evas/canvas/evas_render2.c
+++ b/src/lib/evas/canvas/evas_render2.c
@@ -310,10 +310,10 @@ _evas_render2_begin(Eo *eo_e, Eina_Bool make_updates,
// check viewport size is same as output - not allowed to differ
if ((e->output.w != e->viewport.w) || (e->output.h != e->viewport.h))
ERR("viewport size != output size!");
- // call canvas callbacks saying we are in the pre-render state
- _evas_render2_always_call(eo_e, EVAS_CALLBACK_RENDER_PRE, NULL);
// we have to calculate smare objects before render so do that here
evas_call_smarts_calculate(eo_e);
+ // call canvas callbacks saying we are in the pre-render state
+ _evas_render2_always_call(eo_e, EVAS_CALLBACK_RENDER_PRE, NULL);
// begin out actual rendering bits
_evas_render2_stage_generate_object_updates(e);
_evas_render2_stage_explicit_updates(e);
--
