GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into linux-editor

Browse Source
This commit is contained in:
mafiesto4
2021-01-10 09:14:03 +01:00
parent efa5d05f5f d586f828b2
commit c7547b3a46
2436 changed files with 5156 additions and 31149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Tools/ModelTool/ModelTool.Assimp.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
#if COMPILE_WITH_MODEL_TOOL && USE_ASSIMP

2
Source/Engine/Tools/ModelTool/ModelTool.AutodeskFbxSdk.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
#if COMPILE_WITH_MODEL_TOOL && USE_AUTODESK_FBX_SDK

2
Source/Engine/Tools/ModelTool/ModelTool.Build.cs
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
using System.Collections.Generic;
using System.IO;

2
Source/Engine/Tools/ModelTool/ModelTool.OpenFBX.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
#if COMPILE_WITH_MODEL_TOOL && USE_OPEN_FBX

2
Source/Engine/Tools/ModelTool/ModelTool.Options.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
#if COMPILE_WITH_MODEL_TOOL

4
Source/Engine/Tools/ModelTool/ModelTool.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
#if COMPILE_WITH_MODEL_TOOL
@@ -21,7 +21,7 @@ void RemoveNamespace(String& name)
{
const int32 namespaceStart = name.Find(':');
if (namespaceStart != -1)
name = name.Substring(namespaceStart + 2);
name = name.Substring(namespaceStart + 1);
}
bool ModelTool::ImportData(const String& path, ImportedModelData& data, Options options, String& errorMsg)

2
Source/Engine/Tools/ModelTool/ModelTool.h
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
#pragma once

2
Source/Engine/Tools/ModelTool/VertexTriangleAdjacency.cpp
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
#if COMPILE_WITH_MODEL_TOOL

2
Source/Engine/Tools/ModelTool/VertexTriangleAdjacency.h
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
#pragma once