From c824d41152f5e5fc38ff9864713783a6808e0e6b Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Sat, 2 Jul 2022 13:01:25 +0200 Subject: [PATCH] Fixed merge conflict --- neo/renderer/ModelManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neo/renderer/ModelManager.cpp b/neo/renderer/ModelManager.cpp index 4ae4f532..86246a56 100644 --- a/neo/renderer/ModelManager.cpp +++ b/neo/renderer/ModelManager.cpp @@ -361,10 +361,10 @@ idRenderModel* idRenderModelManagerLocal::GetModel( const char* _modelName, bool { model = new( TAG_MODEL ) idRenderModelGLTF; } - else if( ( extension.Icmp( "dae" ) == 0 ) || ( extension.Icmp( "obj" ) == 0 ) // RB: Collada DAE and Wavefront OBJ + // RB: Collada DAE and Wavefront OBJ + else if( ( extension.Icmp( "dae" ) == 0 ) || ( extension.Icmp( "obj" ) == 0 ) || ( extension.Icmp( "ase" ) == 0 ) || ( extension.Icmp( "lwo" ) == 0 ) || ( extension.Icmp( "flt" ) == 0 ) || ( extension.Icmp( "ma" ) == 0 ) ) - || ( extension.Icmp( "flt" ) == 0 ) || ( extension.Icmp( "ma" ) == 0 ) ) { model = new( TAG_MODEL ) idRenderModelStatic; }