merge from main

Code/Tools/SceneAPI/SceneUI/CommonWidgets/ExpandCollapseToggler.cpp

@@ -58,4 +58,4 @@ namespace AZ
     } // SceneAPI
 } // AZ
 
-#include <CommonWidgets/moc_ExpandCollapseToggler.cpp>
+#include <CommonWidgets/moc_ExpandCollapseToggler.cpp>

Code/Tools/SceneAPI/SceneUI/CommonWidgets/ExpandCollapseToggler.h

@@ -52,4 +52,4 @@ namespace AZ
             };
         } // SceneUI
     } // SceneAPI
-} // AZ
+} // AZ

Code/Tools/SceneAPI/SceneUI/CommonWidgets/JobWatcher.cpp

@@ -98,4 +98,4 @@ namespace AZ
     } // namespace SceneAPI
 } // namespace AZ
 
-#include <CommonWidgets/moc_JobWatcher.cpp>
+#include <CommonWidgets/moc_JobWatcher.cpp>

Code/Tools/SceneAPI/SceneUI/CommonWidgets/OverlayWidget.h

@@ -37,4 +37,4 @@ namespace AZ
             };
         } // namespace SceneUI
     } // namespace SceneAPI
-} // namespace AZ
+} // namespace AZ

Code/Tools/SceneAPI/SceneUI/CommonWidgets/OverlayWidgetLayer.h

@@ -30,4 +30,4 @@ namespace AZ
             };
         } // namespace UI
     } // namespace SceneAPI
-} // namespace AZ
+} // namespace AZ

Code/Tools/SceneAPI/SceneUI/GraphMetaInfoHandler.cpp

@@ -63,4 +63,4 @@ namespace AZ
             }
         } // SceneData
     } // SceneAPI
-} // AZ
+} // AZ

Code/Tools/SceneAPI/SceneUI/GraphMetaInfoHandler.h

@@ -34,4 +34,4 @@ namespace AZ
             };
         } // SceneData
     } // SceneAPI
-} // AZ
+} // AZ

Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/AsyncOperationProcessingHandler.cpp

@@ -59,4 +59,4 @@ namespace AZ
     }
 }
 
-#include <Handlers/ProcessingHandlers/moc_AsyncOperationProcessingHandler.cpp>
+#include <Handlers/ProcessingHandlers/moc_AsyncOperationProcessingHandler.cpp>

Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ExportJobProcessingHandler.cpp

@@ -84,4 +84,4 @@ namespace AZ
     }
 }
 
-#include <Handlers/ProcessingHandlers/moc_ExportJobProcessingHandler.cpp>
+#include <Handlers/ProcessingHandlers/moc_ExportJobProcessingHandler.cpp>

Code/Tools/SceneAPI/SceneUI/Handlers/ProcessingHandlers/ProcessingHandler.cpp

@@ -27,4 +27,4 @@ namespace AZ
     }
 }
 
-#include <Handlers/ProcessingHandlers/moc_ProcessingHandler.cpp>
+#include <Handlers/ProcessingHandlers/moc_ProcessingHandler.cpp>

Code/Tools/SceneAPI/SceneUI/ManifestMetaInfoHandler.cpp

@@ -56,4 +56,4 @@ namespace AZ
             }
         } // SceneData
     } // SceneAPI
-} // AZ
+} // AZ

Code/Tools/SceneAPI/SceneUI/ManifestMetaInfoHandler.h

@@ -33,4 +33,4 @@ namespace AZ
             };
         } // SceneData
     } // SceneAPI
-} // AZ
+} // AZ

Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderHandler.cpp

@@ -85,4 +85,4 @@ namespace AZ
     } // SceneAPI
 } // AZ
 
-#include <RowWidgets/moc_HeaderHandler.cpp>
+#include <RowWidgets/moc_HeaderHandler.cpp>

Code/Tools/SceneAPI/SceneUI/RowWidgets/HeaderHandler.h

@@ -66,4 +66,4 @@ namespace AZ
             };
         } // UI
     } // SceneAPI
-} // AZ
+} // AZ

Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameHandler.cpp

@@ -105,4 +105,4 @@ namespace AZ
     } // SceneAPI
 } // AZ
 
-#include <RowWidgets/moc_ManifestNameHandler.cpp>
+#include <RowWidgets/moc_ManifestNameHandler.cpp>

Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestNameHandler.h

@@ -59,4 +59,4 @@ namespace AZ
             };
         } // SceneUI
     } // SceneAPI
-} // AZ
+} // AZ

Code/Tools/SceneAPI/SceneUI/RowWidgets/ManifestVectorHandler.h

@@ -69,4 +69,4 @@ namespace AZ
             };
         } // UI
     } // SceneAPI
-} // AZ
+} // AZ

Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionHandler.cpp

@@ -197,4 +197,4 @@ namespace AZ
     } // SceneAPI
 } // AZ
 
-#include <RowWidgets/moc_NodeListSelectionHandler.cpp>
+#include <RowWidgets/moc_NodeListSelectionHandler.cpp>

Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeListSelectionHandler.h

@@ -92,4 +92,4 @@ namespace AZ
             };
         } // UI
     } // SceneAPI
-} // AZ
+} // AZ

Code/Tools/SceneAPI/SceneUI/RowWidgets/NodeTreeSelectionHandler.cpp

@@ -169,4 +169,4 @@ namespace AZ
     } // SceneAPI
 } // AZ
 
-#include <RowWidgets/moc_NodeTreeSelectionHandler.cpp>
+#include <RowWidgets/moc_NodeTreeSelectionHandler.cpp>

Code/Tools/SceneAPI/SceneUI/SceneUI.qrc

@@ -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>
+</RCC>

Code/Tools/SceneAPI/SceneUI/SceneUIConfiguration.h

@@ -22,4 +22,4 @@
     #else
         #define SCENE_UI_API AZ_DLL_IMPORT
     #endif
-#endif
+#endif

Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidget.cpp

@@ -202,4 +202,4 @@ namespace AZ
     } // namespace SceneAPI
 } // namespace AZ
 
-#include <SceneWidgets/moc_ManifestWidget.cpp>
+#include <SceneWidgets/moc_ManifestWidget.cpp>