Astyle after merge conflicts

This commit is contained in:
Robert Beckebans 2022-11-18 16:58:08 +01:00
parent 37127cde0e
commit 636e64a1f4

View file

@ -389,7 +389,7 @@ idRenderModel* idRenderModelManagerLocal::GetModel( const char* _modelName, bool
// determine which subclass of idRenderModel to initialize
idRenderModel* model = NULL;
// HvG: GLTF 2 support
if( isGLTF )
{
@ -679,7 +679,7 @@ void idRenderModelManagerLocal::ReloadModels( bool forceAll )
{
continue;
}
bool isGLTF = false;
idStr filename = model->Name();
idStr extension;