Fix .NET generic class typename to match old mono style without inlined assembly name and ver
This commit is contained in:
@@ -10,6 +10,7 @@ using FlaxEditor.Scripting;
|
||||
using FlaxEditor.Utilities;
|
||||
using FlaxEngine;
|
||||
using FlaxEngine.GUI;
|
||||
using FlaxEngine.Utilities;
|
||||
using Object = FlaxEngine.Object;
|
||||
|
||||
namespace FlaxEditor.GUI.Timeline.Tracks
|
||||
|
||||
@@ -9,6 +9,7 @@ using System.Text;
|
||||
using FlaxEditor.GUI.Timeline.Undo;
|
||||
using FlaxEngine;
|
||||
using FlaxEngine.GUI;
|
||||
using FlaxEngine.Utilities;
|
||||
|
||||
namespace FlaxEditor.GUI.Timeline.Tracks
|
||||
{
|
||||
@@ -539,7 +540,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
|
||||
throw new Exception("Invalid track data.");
|
||||
|
||||
var keyframes = new object[keyframesCount];
|
||||
var propertyType = Scripting.TypeUtils.GetType(e.MemberTypeName).Type;
|
||||
var propertyType = TypeUtils.GetType(e.MemberTypeName).Type;
|
||||
if (propertyType == null)
|
||||
{
|
||||
stream.ReadBytes(keyframesCount * (sizeof(float) + valueSize * 3));
|
||||
|
||||
@@ -10,6 +10,7 @@ using System.Text;
|
||||
using FlaxEditor.GUI.Timeline.Undo;
|
||||
using FlaxEngine;
|
||||
using FlaxEngine.GUI;
|
||||
using FlaxEngine.Utilities;
|
||||
|
||||
namespace FlaxEditor.GUI.Timeline.Tracks
|
||||
{
|
||||
@@ -51,7 +52,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
|
||||
{
|
||||
e.EventParamsSizes[i] = stream.ReadInt32();
|
||||
var paramTypeName = LoadName(stream);
|
||||
e.EventParamsTypes[i] = Scripting.TypeUtils.GetManagedType(paramTypeName);
|
||||
e.EventParamsTypes[i] = TypeUtils.GetManagedType(paramTypeName);
|
||||
if (e.EventParamsTypes[i] == null)
|
||||
isInvalid = true;
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ using System.Text;
|
||||
using FlaxEditor.GUI.Timeline.Undo;
|
||||
using FlaxEngine;
|
||||
using FlaxEngine.GUI;
|
||||
using FlaxEngine.Utilities;
|
||||
|
||||
namespace FlaxEditor.GUI.Timeline.Tracks
|
||||
{
|
||||
@@ -56,7 +57,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
|
||||
|
||||
var keyframes = new KeyframesEditor.Keyframe[keyframesCount];
|
||||
var dataBuffer = new byte[e.ValueSize];
|
||||
var propertyType = Scripting.TypeUtils.GetManagedType(e.MemberTypeName);
|
||||
var propertyType = TypeUtils.GetManagedType(e.MemberTypeName);
|
||||
if (propertyType == null)
|
||||
{
|
||||
e.Keyframes.ResetKeyframes();
|
||||
|
||||
@@ -4,6 +4,7 @@ using System;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using FlaxEngine.GUI;
|
||||
using FlaxEngine.Utilities;
|
||||
|
||||
namespace FlaxEditor.GUI.Timeline.Tracks
|
||||
{
|
||||
@@ -48,7 +49,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
|
||||
if (stream.ReadChar() != 0)
|
||||
throw new Exception("Invalid track data.");
|
||||
|
||||
var propertyType = Scripting.TypeUtils.GetType(e.MemberTypeName);
|
||||
var propertyType = TypeUtils.GetType(e.MemberTypeName);
|
||||
if (!propertyType)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(e.MemberTypeName))
|
||||
|
||||
@@ -4,6 +4,7 @@ using System;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using FlaxEngine.Utilities;
|
||||
|
||||
namespace FlaxEditor.GUI.Timeline.Tracks
|
||||
{
|
||||
@@ -51,7 +52,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
|
||||
throw new Exception("Invalid track data.");
|
||||
|
||||
var keyframes = new KeyframesEditor.Keyframe[keyframesCount];
|
||||
var propertyType = Scripting.TypeUtils.GetType(e.MemberTypeName);
|
||||
var propertyType = TypeUtils.GetType(e.MemberTypeName);
|
||||
if (!propertyType)
|
||||
{
|
||||
e.Keyframes.ResetKeyframes();
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using FlaxEngine.Utilities;
|
||||
|
||||
namespace FlaxEditor.GUI.Timeline.Tracks
|
||||
{
|
||||
@@ -50,7 +51,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
|
||||
throw new Exception("Invalid track data.");
|
||||
|
||||
var keyframes = new KeyframesEditor.Keyframe[keyframesCount];
|
||||
var propertyType = Scripting.TypeUtils.GetType(e.MemberTypeName);
|
||||
var propertyType = TypeUtils.GetType(e.MemberTypeName);
|
||||
if (!propertyType)
|
||||
{
|
||||
e.Keyframes.ResetKeyframes();
|
||||
|
||||
@@ -5,6 +5,7 @@ using System.IO;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using FlaxEngine.GUI;
|
||||
using FlaxEngine.Utilities;
|
||||
|
||||
namespace FlaxEditor.GUI.Timeline.Tracks
|
||||
{
|
||||
@@ -49,7 +50,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
|
||||
if (stream.ReadChar() != 0)
|
||||
throw new Exception("Invalid track data.");
|
||||
|
||||
var propertyType = Scripting.TypeUtils.GetType(e.MemberTypeName);
|
||||
var propertyType = TypeUtils.GetType(e.MemberTypeName);
|
||||
if (!propertyType)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(e.MemberTypeName))
|
||||
|
||||
Reference in New Issue
Block a user