[dali_2.2.15] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-scene3d / internal / common / environment-map-load-task.cpp

diff --git a/dali-scene3d/internal/common/environment-map-load-task.cpp b/dali-scene3d/internal/common/environment-map-load-task.cpp
index d230e99..d847f46 100644 (file)
--- a/dali-scene3d/internal/common/environment-map-load-task.cpp
+++ b/dali-scene3d/internal/common/environment-map-load-task.cpp
@@ -58,9 +58,9 @@ bool EnvironmentMapLoadTask::HasSucceeded() const
   return mHasSucceeded;
 }
 
-Dali::Scene3D::Loader::EnvironmentMapData& EnvironmentMapLoadTask::GetEnvironmentMap()
+Dali::Texture EnvironmentMapLoadTask::GetLoadedTexture()
 {
-  return mEnvironmentMapData;
+  return (HasSucceeded()) ? mEnvironmentMapData.GetTexture() : Texture();;
 }
 
 } // namespace Internal