birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merging latest origin

Browse Source
This commit is contained in:
karlberg
2021-05-03 21:27:27 -07:00
parent d5ad5d9596 edf8ab4822
commit d0a561fa01
4864 changed files with 37281 additions and 612775 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/SceneAPI/SceneCore/Containers/GraphObjectProxy.cpp
+3
View File
@@ -25,9 +25,12 @@ namespace AZ
AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context);
if (behaviorContext)
{
behaviorContext->Class<DataTypes::IGraphObject>();
behaviorContext->Class<GraphObjectProxy>()
->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
->Attribute(AZ::Script::Attributes::Module, "scene.graph")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
->Method("CastWithTypeName", &GraphObjectProxy::CastWithTypeName)
->Method("Invoke", &GraphObjectProxy::Invoke)
;
Code/Tools/SceneAPI/SceneUI/SceneUI.qrc
+13 -13
View File
@@ -1,21 +1,21 @@
<RCC>
<qresource prefix="/SceneUI/Graph">
<file alias="MeshIcon.png">../../../../Editor/Icons/AssetImporter/mesh_on.png</file>
<file alias="AnimationIcon.png">../../../../Editor/Icons/AssetImporter/animation_on.png</file>
<file alias="BoneIcon.png">../../../../Editor/Icons/AssetImporter/skeleton_on.png</file>
<file alias="MeshIcon.png">../../../../Assets/Editor/Icons/AssetImporter/mesh_on.png</file>
<file alias="AnimationIcon.png">../../../../Assets/Editor/Icons/AssetImporter/animation_on.png</file>
<file alias="BoneIcon.png">../../../../Assets/Editor/Icons/AssetImporter/skeleton_on.png</file>
</qresource>
<qresource prefix="/SceneUI/Manifest">
<file alias="TreeIcon.png">../../../../Editor/Icons/AssetImporter/tree.png</file>
<file alias="MeshGroupIcon.png">../../../../Editor/Icons/AssetImporter/mesh.png</file>
<file alias="AnimationGroupIcon.png">../../../../Editor/Icons/AssetImporter/animation.png</file>
<file alias="SkeletonGroupIcon.png">../../../../Editor/Icons/AssetImporter/skeleton.png</file>
<file alias="SkinGroupIcon.png">../../../../Editor/Icons/AssetImporter/skin.png</file>
<file alias="TreeIcon.png">../../../../Assets/Editor/Icons/AssetImporter/tree.png</file>
<file alias="MeshGroupIcon.png">../../../../Assets/Editor/Icons/AssetImporter/mesh.png</file>
<file alias="AnimationGroupIcon.png">../../../../Assets/Editor/Icons/AssetImporter/animation.png</file>
<file alias="SkeletonGroupIcon.png">../../../../Assets/Editor/Icons/AssetImporter/skeleton.png</file>
<file alias="SkinGroupIcon.png">../../../../Assets/Editor/Icons/AssetImporter/skin.png</file>
</qresource>
<qresource prefix="/SceneUI/Common">
<file alias="WarningIcon.png">../../../../Editor/Styles/StyleSheetImages/info_icon.png</file>
<file alias="ErrorIcon.png">../../../../Editor/Styles/StyleSheetImages/error_icon.png</file>
<file alias="AssertIcon.png">../../../../Editor/Icons/Assets/Lua.png</file>
<file alias="ExpandIcon.png">../../../../Editor/Icons/PropertyEditor/group_closed.png</file>
<file alias="CollapseIcon.png">../../../../Editor/Icons/PropertyEditor/group_open.png</file>
<file alias="WarningIcon.png">../../../../Assets/Editor/Styles/StyleSheetImages/info_icon.png</file>
<file alias="ErrorIcon.png">../../../../Assets/Editor/Styles/StyleSheetImages/error_icon.png</file>
<file alias="AssertIcon.png">../../../../Assets/Editor/Icons/Assets/Lua.png</file>
<file alias="ExpandIcon.png">../../../../Assets/Editor/Icons/PropertyEditor/group_closed.png</file>
<file alias="CollapseIcon.png">../../../../Assets/Editor/Icons/PropertyEditor/group_open.png</file>
</qresource>
</RCC>