From 0f53c486ede20258d564c1927a1e444a8bdd8a8f Mon Sep 17 00:00:00 2001 From: Menotdan <32620310+Menotdan@users.noreply.github.com> Date: Tue, 26 Sep 2023 00:05:50 -0400 Subject: [PATCH] Fixed formatting to match master branch --- Source/Editor/Content/Import/ModelImportEntry.cs | 1 - Source/Engine/Content/Content.cpp | 1 - Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp | 1 - 3 files changed, 3 deletions(-) diff --git a/Source/Editor/Content/Import/ModelImportEntry.cs b/Source/Editor/Content/Import/ModelImportEntry.cs index a29036c88..bbb384562 100644 --- a/Source/Editor/Content/Import/ModelImportEntry.cs +++ b/Source/Editor/Content/Import/ModelImportEntry.cs @@ -1,6 +1,5 @@ // Copyright (c) 2012-2023 Wojciech Figat. All rights reserved. -using System; using System.Collections.Generic; using FlaxEditor.CustomEditors.Editors; using FlaxEditor.Scripting; diff --git a/Source/Engine/Content/Content.cpp b/Source/Engine/Content/Content.cpp index 4ad97ebc2..eabf58cf2 100644 --- a/Source/Engine/Content/Content.cpp +++ b/Source/Engine/Content/Content.cpp @@ -28,7 +28,6 @@ #if ENABLE_ASSETS_DISCOVERY #include "Engine/Core/Collections/HashSet.h" #endif -#include TimeSpan Content::AssetsUpdateInterval = TimeSpan::FromMilliseconds(500); TimeSpan Content::AssetsUnloadInterval = TimeSpan::FromSeconds(10); diff --git a/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp b/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp index f91c1b4b3..215eadaba 100644 --- a/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp +++ b/Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp @@ -542,7 +542,6 @@ bool ProcessMesh(ImportedModelData& result, OpenFbxImporterData& data, const ofb else aMaterial = aMesh->getMaterial(0); } - mesh.MaterialSlotIndex = data.AddMaterial(result, aMaterial); // Vertex positions