GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'actor-org' of https://github.com/Tryibion/FlaxEngine into Tryibion-actor-org

Browse Source
This commit is contained in:
Wojtek Figat
2023-01-24 19:20:23 +01:00
parent 03813259cf ff3277edc7
commit 29815e0dd6
15 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs
View File

@@ -253,7 +253,7 @@ namespace FlaxEditor.Windows.Assets
if (actorType.IsAbstract)
continue;
ActorContextMenuAttribute attribute = null;
foreach (var e in actorType.GetAttributes(true))
foreach (var e in actorType.GetAttributes(false))
{
if (e is ActorContextMenuAttribute actorContextMenuAttribute)
{

2
Source/Editor/Windows/ContentWindow.ContextMenu.cs
View File

@@ -162,7 +162,7 @@ namespace FlaxEditor.Windows
// Get attribute
ContentContextMenuAttribute attribute = null;
foreach (var typeAttribute in type.GetAttributes(true))
foreach (var typeAttribute in type.GetAttributes(false))
{
if (typeAttribute is ContentContextMenuAttribute contentContextMenuAttribute)
{

6
Source/Editor/Windows/SceneTreeWindow.ContextMenu.cs
View File

@@ -66,7 +66,7 @@ namespace FlaxEditor.Windows
if (actorType.IsAbstract)
continue;
ActorContextMenuAttribute attribute = null;
foreach (var e in actorType.GetAttributes(true))
foreach (var e in actorType.GetAttributes(false))
{
if (e is ActorContextMenuAttribute actorContextMenuAttribute)
{
@@ -152,11 +152,11 @@ namespace FlaxEditor.Windows
// go through each actor and add it to the context menu if it has the ActorContextMenu attribute
foreach (var actorType in Editor.CodeEditing.Actors.Get())
{
if (actorType.IsAbstract || !actorType.HasAttribute(typeof(ActorContextMenuAttribute), true))
if (actorType.IsAbstract || !actorType.HasAttribute(typeof(ActorContextMenuAttribute), false))
continue;
ActorContextMenuAttribute attribute = null;
foreach (var actorAttribute in actorType.GetAttributes(true))
foreach (var actorAttribute in actorType.GetAttributes(false))
{
if (actorAttribute is ActorContextMenuAttribute actorContextMenuAttribute)
{

2
Source/Editor/Windows/ToolboxWindow.cs
View File

@@ -250,7 +250,7 @@ namespace FlaxEditor.Windows
foreach (var actorType in Editor.CodeEditing.Actors.Get())
{
ActorToolboxAttribute attribute = null;
foreach (var e in actorType.GetAttributes(true))
foreach (var e in actorType.GetAttributes(false))
{
if (e is ActorToolboxAttribute actorToolboxAttribute)
{