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

Merge remote-tracking branch 'origin/master' into navigation-features

Browse Source 
# Conflicts:
#	Source/Editor/Content/Settings/NavigationSettings.cs
#	Source/Engine/Engine/PhysicalMaterial.cs
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.Api.cs
This commit is contained in:
Wojtek Figat
2021-01-04 14:31:56 +01:00
parent b38ccb0fbd d715c0c0dd
commit cc8e78b505
2425 changed files with 4606 additions and 30937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Content/JsonAsset.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.
#include "JsonAsset.h"
#include "Storage/ContentStorageManager.h"
@@ -131,7 +131,7 @@ Asset::LoadResult JsonAssetBase::loadAsset()
Document.Parse(data.Get<char>(), data.Length());
if (Document.HasParseError())
{
Log::JsonParseException(Document.GetParseError());
Log::JsonParseException(Document.GetParseError(), Document.GetErrorOffset());
return LoadResult::CannotLoadData;
}