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

[platform/core/uifw/dali-toolkit.git] / dali-scene3d / public-api / loader / model-loader.cpp

diff --git a/dali-scene3d/public-api/loader/model-loader.cpp b/dali-scene3d/public-api/loader/model-loader.cpp
index 219f0a9..211b0e0 100644 (file)
--- a/dali-scene3d/public-api/loader/model-loader.cpp
+++ b/dali-scene3d/public-api/loader/model-loader.cpp
@@ -25,15 +25,11 @@
 
 // INTERNAL INCLUDES
 #include <dali-scene3d/internal/loader/dli-loader-impl.h>
-#include <dali-scene3d/internal/loader/gltf2-loader-impl.h>
 #include <dali-scene3d/internal/loader/glb-loader-impl.h>
+#include <dali-scene3d/internal/loader/gltf2-loader-impl.h>
 #include <dali-scene3d/internal/loader/model-loader-impl.h>
 
-namespace Dali
-{
-namespace Scene3D
-{
-namespace Loader
+namespace Dali::Scene3D::Loader
 {
 namespace
 {
@@ -137,7 +133,7 @@ void ModelLoader::LoadResource(Dali::Scene3D::Loader::ResourceBundle::PathProvid
     return;
   }
 
-  Dali::Scene3D::Loader::ResourceRefCounts resourceRefCount = std::move(mLoadResult.mResources.CreateRefCounter());
+  Dali::Scene3D::Loader::ResourceRefCounts resourceRefCount = mLoadResult.mResources.CreateRefCounter();
   for(auto iRoot : GetScene().GetRoots())
   {
     GetScene().CountResourceRefs(iRoot, mResourceChoices, resourceRefCount);
@@ -156,6 +152,4 @@ void ModelLoader::LoadResource(Dali::Scene3D::Loader::ResourceBundle::PathProvid
   }
 }
 
-} // namespace Loader
-} // namespace Scene3D
-} // namespace Dali
+} // namespace Dali::Scene3D::Loader