Minor tweaks
This commit is contained in:
@@ -40,7 +40,6 @@ namespace FlaxEditor
|
||||
{
|
||||
// Try path relative to the plugin project Content
|
||||
iconPath = Path.Combine(assemblyDir, "../../../../../Content", assemblyName + ".Icon.flax");
|
||||
MessageBox.Show(StringUtils.NormalizePath(StringUtils.RemovePathRelativeParts(iconPath)));
|
||||
if (!File.Exists(iconPath))
|
||||
{
|
||||
return null;
|
||||
|
||||
@@ -60,7 +60,7 @@ namespace FlaxEngine
|
||||
/// <param name="flag">The flag(s) to check.</param>
|
||||
/// <returns>True if has flag(s) set, otherwise false.</returns>
|
||||
[Unmanaged]
|
||||
[Tooltip("Returns true if object has given flag(s) set..")]
|
||||
[Tooltip("Returns true if object has given flag(s) set.")]
|
||||
public bool HasStaticFlag(StaticFlags flag)
|
||||
{
|
||||
return (StaticFlags & flag) == flag;
|
||||
|
||||
@@ -29,7 +29,7 @@ public:
|
||||
/// <summary>
|
||||
/// Custom icon texture (asset id) to use for the application (overrides the default one).
|
||||
/// </summary>
|
||||
API_FIELD(Attributes="EditorOrder(1030), AssetReference(typeof(Texture)), EditorDisplay(\"Other\")")
|
||||
API_FIELD(Attributes="EditorOrder(1030), CustomEditorAlias(\"FlaxEditor.CustomEditors.Editors.AssetRefEditor\"), AssetReference(typeof(Texture)), EditorDisplay(\"Other\")")
|
||||
Guid OverrideIcon;
|
||||
|
||||
public:
|
||||
|
||||
@@ -31,7 +31,7 @@ public class Profiler : EngineModule
|
||||
// Tracy profiling tools
|
||||
switch (options.Platform.Target)
|
||||
{
|
||||
case TargetPlatform.Android: // dlopen failed: cannot locate symbol `tracy::ScopedZone::~ScopedZone()` referenced by "libFlaxGame.so"
|
||||
case TargetPlatform.Android:
|
||||
case TargetPlatform.Linux:
|
||||
case TargetPlatform.Windows:
|
||||
options.PublicDependencies.Add("tracy");
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
#include "Script.h"
|
||||
#include "Engine/Core/Log.h"
|
||||
#include "ManagedSerialization.h"
|
||||
#if USE_EDITOR
|
||||
#include "StdTypesContainer.h"
|
||||
#include "ManagedCLR/MClass.h"
|
||||
|
||||
Reference in New Issue
Block a user