GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 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

6
Source/Engine/Scripting/ScriptingObject.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 "ScriptingObject.h"
#include "Scripting.h"
@@ -137,7 +137,7 @@ MonoObject* ScriptingObject::CreateManagedInternal()
MClass* monoClass = GetClass();
if (monoClass == nullptr)
{
LOG(Warning, "Missing managed class for objecct '{0}'.", ToString());
LOG(Warning, "Missing managed class for object with id {0}", GetID());
return nullptr;
}
@@ -249,7 +249,7 @@ void ScriptingObject::OnDeleteObject()
String ScriptingObject::ToString() const
{
return GetClass()->ToString();
return _type ? _type.GetType().ManagedClass->ToString() : String::Empty;
}
ManagedScriptingObject::ManagedScriptingObject(const SpawnParams& params)