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

[platform/core/uifw/dali-toolkit.git] / dali-scene3d / public-api / loader / environment-map-loader.h

diff --git a/dali-scene3d/public-api/loader/environment-map-loader.h b/dali-scene3d/public-api/loader/environment-map-loader.h
index 57047ea..ddbf86c 100644 (file)
--- a/dali-scene3d/public-api/loader/environment-map-loader.h
+++ b/dali-scene3d/public-api/loader/environment-map-loader.h
@@ -19,27 +19,21 @@
 
 // INTERNAL INCLUDES
 #include <dali-scene3d/public-api/api.h>
-#include <dali-scene3d/public-api/loader/environment-map-data.h>
 #include <dali-scene3d/public-api/common/environment-map.h>
+#include <dali-scene3d/public-api/loader/environment-map-data.h>
 
-namespace Dali
-{
-namespace Scene3D
+namespace Dali::Scene3D::Loader
 {
-namespace Loader
-{
-
 /**
  * @brief Loads environment map data from a environment map file.
  *
+ * @SINCE_2_1.32
  * @param[in] environmentMapUrl The environment map file url.
  * @param[out] environmentMapData The data structure with all pixel data objects.
  * @return bool True if the loading is succeded.
  */
 bool DALI_SCENE3D_API LoadEnvironmentMap(const std::string& environmentMapUrl, EnvironmentMapData& environmentMapData);
 
-} // namespace Loader
-} // namespace Scene3D
-} // namespace Dali
+} // namespace Dali::Scene3D::Loader
 
 #endif // DALI_SCENE3D_LOADER_ENVIRONMENT_MAP_LOADER_H