hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=16888f3e495bbe5b4a0eb415e54f2fbe5ad847f1
commit 16888f3e495bbe5b4a0eb415e54f2fbe5ad847f1 Author: ChunEon Park <[email protected]> Date: Tue Apr 15 13:36:20 2014 +0900 evas/evas3d: don't occur build break. the declared t3d_scene api names are not matched exactly between header and code. these name should be just "3d_scene" and still there was a Evas_3D.h reference in evas Makefile. --- src/Makefile_Evas.am | 3 --- src/lib/evas/Evas_Common.h | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 673bcd6..98d6072 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -275,9 +275,6 @@ lib/evas/file/evas_path.h lib_evas_libevas_la_SOURCES += \ $(lib_evas_file_SOURCES) -# 3D -dist_installed_evasmainheaders_DATA += lib/evas/Evas_3D.h - noinst_HEADERS += \ lib/evas/include/evas_3d_utils.h \ lib/evas/include/evas_3d_private.h diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index 84f5609..6912d96 100644 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h @@ -5771,7 +5771,7 @@ typedef enum _Evas_3D_Pick_Type * * @ingroup Evas_3D_Scene */ -EAPI void evas_object_image_t3d_scene_set(Evas_Object *obj, Evas_3D_Scene *scene) EINA_ARG_NONNULL(1); +EAPI void evas_object_image_3d_scene_set(Evas_Object *obj, Evas_3D_Scene *scene) EINA_ARG_NONNULL(1); /** * Get the current scene of an image object. @@ -5781,7 +5781,7 @@ EAPI void evas_object_image_t3d_scene_set(Evas_Object *obj, Evas_3 * * @ingroup Evas_3D_Scene */ -EAPI Evas_3D_Scene *evas_object_image_t3d_scene_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); +EAPI Evas_3D_Scene *evas_object_image_3d_scene_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); /** * Create a new scene on the given Evas @p e canvas. --
