Merge branch 'development' into cmake/SPEC-7179

Gems/LyShine/Code/Source/LyShineModule.cpp

@@ -50,9 +50,9 @@
 #include "World/UiCanvasProxyRefComponent.h"
 #include "World/UiCanvasOnMeshComponent.h"
 
-#if defined (LYSHINE_EDITOR)
-#   include "Pipeline/LyShineBuilder/LyShineBuilderComponent.h"
-#endif // LYSHINE_EDITOR
+#if defined(LYSHINE_BUILDER)
+#include "Pipeline/LyShineBuilder/LyShineBuilderComponent.h"
+#endif // LYSHINE_BUILDER
 
 namespace LyShine
 {
@@ -62,7 +62,7 @@ namespace LyShine
         // Push results of [MyComponent]::CreateDescriptor() into m_descriptors here.
         m_descriptors.insert(m_descriptors.end(), {
                 LyShineSystemComponent::CreateDescriptor(),
-#if defined (LYSHINE_EDITOR)
+#if defined(LYSHINE_EDITOR)
                 LyShineEditor::LyShineEditorSystemComponent::CreateDescriptor(),
 #endif
                 UiCanvasAssetRefComponent::CreateDescriptor(),
@@ -101,7 +101,7 @@ namespace LyShine
                 UiRadioButtonComponent::CreateDescriptor(),
                 UiRadioButtonGroupComponent::CreateDescriptor(),
                 UiParticleEmitterComponent::CreateDescriptor(),
-    #if defined(LYSHINE_EDITOR)
+    #if defined(LYSHINE_BUILDER)
                 // Builder
                 LyShineBuilder::LyShineBuilderComponent::CreateDescriptor(),
     #endif
@@ -121,7 +121,7 @@ namespace LyShine
     {
         return AZ::ComponentTypeList{
                    azrtti_typeid<LyShineSystemComponent>(),
-    #if defined (LYSHINE_EDITOR)
+    #if defined(LYSHINE_EDITOR)
                    azrtti_typeid<LyShineEditor::LyShineEditorSystemComponent>(),
     #endif
     #if AZ_LOADSCREENCOMPONENT_ENABLED