Merge branch 'development' into VisualScripting

This commit is contained in:
Robert committed 2021-09-30 16:56:19 +02:00
commit 4f5d76de88
23 files changed
+554 -469

No files matched your search

@@ -261,7 +261,12 @@ namespace Artemis.Core.Modules
internal T? GetDynamicChildValue<T>(string key)
{
if (TryGetDynamicChild(key, out DynamicChild? dynamicChild) && dynamicChild.BaseValue != null)
return (T) dynamicChild.BaseValue;
{
if (dynamicChild.BaseValue is T value)
return value;
return default;
}
return default;
}
+1 -1
View File
@@ -240,7 +240,7 @@ namespace Artemis.Core.Modules
/// <returns></returns>
public virtual DataModelPropertyAttribute GetDataModelDescription()
{
return new DataModelPropertyAttribute {Name = Plugin.Info.Name, Description = Plugin.Info.Description};
return new() {Name = Info.Name, Description = Info.Description};
}
/// <summary>