summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunEon Park <chuneon.park@samsung.com>2014-04-15 13:36:20 +0900
committerChunEon Park <chuneon.park@samsung.com>2014-04-15 13:36:20 +0900
commit44139c49ddcb2ab05771b889aa25c9f24cf3c0e4 (patch)
tree5332c1defa8ca4b51b526a87d248561f1e61f8f7
parent37b5f377198c81b19b3175936f22d991114eda72 (diff)
downloadefl-44139c49ddcb2ab05771b889aa25c9f24cf3c0e4.tar.gz
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.
-rw-r--r--src/Makefile_Evas.am3
-rw-r--r--src/lib/evas/Evas_Common.h4
2 files changed, 2 insertions, 5 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index ae221aa7e9..1e96af6beb 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -257,9 +257,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 d11f30db02..4f58f3f93f 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -5767,7 +5767,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.
@@ -5777,7 +5777,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.