Browse Source

Merge pull request #4314 from pseiderer/ps-devel-fix-namespace-001

RFC: BlenderScene: use explicit namespace instead of using namespace
Kim Kulling 3 years ago
parent
commit
049a241855
1 changed files with 5 additions and 2 deletions
  1. 5 2
      code/AssetLib/Blender/BlenderScene.cpp

+ 5 - 2
code/AssetLib/Blender/BlenderScene.cpp

@@ -49,8 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BlenderDNA.h"
 #include "BlenderSceneGen.h"
 
-using namespace Assimp;
-using namespace Assimp::Blender;
+namespace Assimp {
+namespace Blender {
 
 //--------------------------------------------------------------------------------
 template <>
@@ -885,4 +885,7 @@ void DNA::RegisterConverters() {
     converters["CollectionObject"] = DNA::FactoryPair(&Structure::Allocate<CollectionObject>, &Structure::Convert<CollectionObject>);
 }
 
+} // namespace Blender
+} //namespace Assimp
+
 #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER