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

Fix editor deployment

Browse Source
This commit is contained in:
Wojtek Figat
2023-06-17 11:08:51 +02:00
parent 3645377b15
commit f995d12686
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Engine/Content/Content.cpp
View File

@@ -20,9 +20,7 @@
#include "Engine/Level/Types.h" #include "Engine/Level/Types.h"
#include "Engine/Profiler/ProfilerCPU.h" #include "Engine/Profiler/ProfilerCPU.h"
#include "Engine/Scripting/ManagedCLR/MClass.h" #include "Engine/Scripting/ManagedCLR/MClass.h"
#include "Engine/Scripting/ManagedCLR/MUtils.h"
#include "Engine/Scripting/Scripting.h" #include "Engine/Scripting/Scripting.h"
#include "Engine/Utilities/StringConverter.h"
#if USE_EDITOR #if USE_EDITOR
#include "Editor/Editor.h" #include "Editor/Editor.h"
#include "Editor/ProjectInfo.h" #include "Editor/ProjectInfo.h"
@@ -1007,7 +1005,6 @@ Asset* Content::load(const Guid& id, const ScriptingTypeHandle& type, AssetInfo&
} }
#if ASSETS_LOADING_EXTRA_VERIFICATION #if ASSETS_LOADING_EXTRA_VERIFICATION
// Check if file exists
if (!FileSystem::FileExists(assetInfo.Path)) if (!FileSystem::FileExists(assetInfo.Path))
{ {
LOG(Error, "Cannot find file '{0}'", assetInfo.Path); LOG(Error, "Cannot find file '{0}'", assetInfo.Path);
@@ -1032,26 +1029,19 @@ Asset* Content::load(const Guid& id, const ScriptingTypeHandle& type, AssetInfo&
} }
#if ASSETS_LOADING_EXTRA_VERIFICATION #if ASSETS_LOADING_EXTRA_VERIFICATION
// Validate type
if (IsAssetTypeIdInvalid(type, result->GetTypeHandle()) && !result->Is(type)) if (IsAssetTypeIdInvalid(type, result->GetTypeHandle()) && !result->Is(type))
{ {
LOG(Error, "Different loaded asset type! Asset: '{0}'. Expected type: {1}", assetInfo.ToString(), type.ToString()); LOG(Error, "Different loaded asset type! Asset: '{0}'. Expected type: {1}", assetInfo.ToString(), type.ToString());
result->DeleteObject(); result->DeleteObject();
return nullptr; return nullptr;
} }
#endif #endif
// Register asset // Register asset
ASSERT(result->GetID() == id); ASSERT(result->GetID() == id);
AssetsLocker.Lock(); AssetsLocker.Lock();
#if ASSETS_LOADING_EXTRA_VERIFICATION #if ASSETS_LOADING_EXTRA_VERIFICATION
// Asset id has to be unique ASSERT(!Assets.ContainsKey(id));
if (Assets.ContainsKey(id))
{
CRASH;
}
#endif #endif
Assets.Add(id, result); Assets.Add(id, result);
AssetsLocker.Unlock(); AssetsLocker.Unlock();

1
Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs
View File

@@ -60,7 +60,6 @@ namespace Flax.Deploy
DeployFile(src, dst, "Flax.Build.deps.json"); DeployFile(src, dst, "Flax.Build.deps.json");
DeployFile(src, dst, "Flax.Build.runtimeconfig.json"); DeployFile(src, dst, "Flax.Build.runtimeconfig.json");
DeployFile(src, dst, "Ionic.Zip.Reduced.dll"); DeployFile(src, dst, "Ionic.Zip.Reduced.dll");
DeployFile(src, dst, "Newtonsoft.Json.dll");
DeployFile(src, dst, "Mono.Cecil.dll"); DeployFile(src, dst, "Mono.Cecil.dll");
DeployFile(src, dst, "Microsoft.CodeAnalysis.dll"); DeployFile(src, dst, "Microsoft.CodeAnalysis.dll");
DeployFile(src, dst, "Microsoft.CodeAnalysis.CSharp.dll"); DeployFile(src, dst, "Microsoft.CodeAnalysis.CSharp.dll");