From 4a8291d59605e88d152052ec210c35ae6a6b2db6 Mon Sep 17 00:00:00 2001 From: Wojciech Figat Date: Thu, 9 Dec 2021 17:08:10 +0100 Subject: [PATCH] Minor fixes --- Source/Editor/CustomEditors/Editors/TypeEditor.cs | 6 ------ Source/Editor/GUI/Dialogs/ColorPickerDialog.cs | 3 --- Source/Editor/GUI/Dialogs/ColorSelector.cs | 2 +- Source/Editor/Surface/SurfaceUtils.cs | 2 ++ Source/Engine/Content/Content.cpp | 4 ---- 5 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Source/Editor/CustomEditors/Editors/TypeEditor.cs b/Source/Editor/CustomEditors/Editors/TypeEditor.cs index 0c8a22007..2f1c221cd 100644 --- a/Source/Editor/CustomEditors/Editors/TypeEditor.cs +++ b/Source/Editor/CustomEditors/Editors/TypeEditor.cs @@ -33,9 +33,6 @@ namespace FlaxEditor.CustomEditors.Editors /// /// Gets or sets the allowed type (given type and all sub classes). Must be type of any subclass. /// - /// - /// The allowed type. - /// public ScriptType Type { get => _type; @@ -57,9 +54,6 @@ namespace FlaxEditor.CustomEditors.Editors /// /// Gets or sets the selected types value. /// - /// - /// The value. - /// public ScriptType Value { get => _value; diff --git a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs index bd16f1469..6e5be2d04 100644 --- a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs +++ b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs @@ -53,9 +53,6 @@ namespace FlaxEditor.GUI.Dialogs /// /// Gets the selected color. /// - /// - /// The color. - /// public Color SelectedColor { get => _value; diff --git a/Source/Editor/GUI/Dialogs/ColorSelector.cs b/Source/Editor/GUI/Dialogs/ColorSelector.cs index 0cfc452fe..577663800 100644 --- a/Source/Editor/GUI/Dialogs/ColorSelector.cs +++ b/Source/Editor/GUI/Dialogs/ColorSelector.cs @@ -58,7 +58,7 @@ namespace FlaxEditor.GUI.Dialogs /// Initializes a new instance of the class. /// /// Size of the wheel. - public ColorSelector(float wheelSize = 64) + public ColorSelector(float wheelSize) : base(0, 0, wheelSize, wheelSize) { _colorWheelSprite = Editor.Instance.Icons.ColorWheel128; diff --git a/Source/Editor/Surface/SurfaceUtils.cs b/Source/Editor/Surface/SurfaceUtils.cs index 75b649bf0..ead59f918 100644 --- a/Source/Editor/Surface/SurfaceUtils.cs +++ b/Source/Editor/Surface/SurfaceUtils.cs @@ -430,6 +430,8 @@ namespace FlaxEditor.Surface internal static string GetVisualScriptTypeDescription(ScriptType type) { + if (type == ScriptType.Null) + return "null"; var sb = new StringBuilder(); if (type.IsStatic) sb.Append("static "); diff --git a/Source/Engine/Content/Content.cpp b/Source/Engine/Content/Content.cpp index 3f5de3a0a..7a26ef339 100644 --- a/Source/Engine/Content/Content.cpp +++ b/Source/Engine/Content/Content.cpp @@ -211,12 +211,8 @@ bool FindAssets(const ProjectInfo* project, HashSet& project bool Content::GetAssetInfo(const Guid& id, AssetInfo& info) { - // Validate ID if (!id.IsValid()) - { - LOG(Warning, "Invalid asset ID."); return false; - } #if ENABLE_ASSETS_DISCOVERY