Merge main

2021-04-27 11:05:22 -07:00
parent fdcb19f45a 6aa5b5698f
commit 5f33337fec
4521 changed files with 45204 additions and 58318 deletions
@@ -35,4 +35,4 @@ namespace AzToolsFramework
    }
 }

-#include "UI/ComponentPalette/moc_ComponentPaletteModel.cpp"
+#include "UI/ComponentPalette/moc_ComponentPaletteModel.cpp"
@@ -55,4 +55,4 @@ namespace AzToolsFramework
    }
 }

-#include "UI/ComponentPalette/moc_ComponentPaletteModelFilter.cpp"
+#include "UI/ComponentPalette/moc_ComponentPaletteModelFilter.cpp"
@@ -24,4 +24,4 @@ namespace AzToolsFramework
        QMenu* parentMenu,
        const AzToolsFramework::EntityIdSet& entitySelectionWithFlatHierarchy,
        NewLayerFunction newLayerFunction);
-}
+}
@@ -51,4 +51,4 @@ namespace LegacyFramework
    };
 }

-#endif
+#endif
@@ -62,4 +62,4 @@ namespace AzToolsFramework
                ->Field("m_serializableWindowState", &MainWindowSavedState::m_serializableWindowState);
        }
    }
-}
+}
@@ -53,4 +53,4 @@ namespace AzToolsFramework
    };
 }

-#endif
+#endif
@@ -94,4 +94,4 @@ namespace AzToolsFramework

        return dlg.m_result;
    }
-}
+}
@@ -92,4 +92,4 @@ namespace AzToolsFramework
    } // Logging
 } // AzToolsFramework

-#endif
+#endif
@@ -104,4 +104,4 @@ namespace AzToolsFramework
    }
 }

-Q_DECLARE_METATYPE(const AzToolsFramework::Logging::LogLine*);
+Q_DECLARE_METATYPE(const AzToolsFramework::Logging::LogLine*);
@@ -115,4 +115,4 @@ namespace AzToolsFramework
    } // namespace Logging
 } // namespace AzToolsFramework

-#include "UI/Logging/moc_LogTableItemDelegate.cpp"
+#include "UI/Logging/moc_LogTableItemDelegate.cpp"
@@ -316,4 +316,4 @@ namespace AzToolsFramework
    }
 } // namespace AzToolsFramework

-#include "UI/Logging/moc_LogTableModel.cpp"
+#include "UI/Logging/moc_LogTableModel.cpp"
@@ -29,4 +29,4 @@ namespace AzToolsFramework
    }
 }

-#endif
+#endif
@@ -56,4 +56,4 @@ namespace AzToolsFramework
    } // namespace LogPanel
 } // namespace AzToolsFramework

-#endif
+#endif
@@ -102,4 +102,4 @@ namespace AzToolsFramework
            virtual void Clear();
        };
    } // namespace LogPanel
-} // namespace AzToolsFramework
+} // namespace AzToolsFramework
@@ -118,4 +118,4 @@ namespace AzToolsFramework
    }
 }

-#include "UI/PropertyEditor/moc_ComponentEditorHeader.cpp"
+#include "UI/PropertyEditor/moc_ComponentEditorHeader.cpp"
@@ -58,4 +58,4 @@ namespace AzToolsFramework
        slider->setFocusPolicy(Qt::StrongFocus);
        slider->setFocusProxy(spinbox);
    }
-}
+}
@@ -43,4 +43,4 @@ namespace AzToolsFramework
    void InitializeSliderPropertyWidgets(QSlider*, QAbstractSpinBox*);
 }

-#endif
+#endif
@@ -98,4 +98,4 @@ namespace AzToolsFramework
    }
 }

-#include "UI/PropertyEditor/moc_EntityIdQLabel.cpp"
+#include "UI/PropertyEditor/moc_EntityIdQLabel.cpp"
@@ -86,4 +86,4 @@ namespace AzToolsFramework
    }
 }

-#include "UI/PropertyEditor/moc_GrowTextEdit.cpp"
+#include "UI/PropertyEditor/moc_GrowTextEdit.cpp"
@@ -53,4 +53,4 @@ namespace AzToolsFramework
    };

    void RegisterMultiLineEditHandler();
-}
+}
@@ -347,4 +347,4 @@ namespace AzToolsFramework
    }
 } // namespace AzToolsFramework

-#endif
+#endif
@@ -7,4 +7,4 @@
    <g id="icon-/-outliner-/-entity-/-Default---Saved" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <path d="M13.69163,3.24686842 L8.01783965,6.52512131 L2.34404932,3.24686842 L8,0.481790242 L13.69163,3.24686842 Z M7.25035308,7.82264135 L7.25035308,14.7689324 L1.9912897,11.7236967 L1.9912897,4.79310939 L7.25035308,7.82264135 Z M14.0326515,11.6884321 L8.74360561,14.7769163 L8.74360561,7.8257203 L14.0024918,4.79949203 L14.0326515,11.6884321 Z" id="Shape" fill="#4285F4" fill-rule="nonzero"></path>
    </g>
-</svg>
+</svg>
@@ -10,4 +10,4 @@
            <path d="M11.9999166,9.73463536 C13.6052347,11.1311262 14.1508753,12.7679159 14.257424,13.505867 C13.6491663,13.505867 8.62210474,13.5009029 8.19563964,13.505867 C8.19563964,12.3483124 8.19563964,9.55037517 8.19563964,8.0672756 C8.34990272,8.0672756 10.2176801,8.18424048 11.9999166,9.73463536 Z" id="Triangle-2" transform="translate(11.226532, 10.786571) rotate(90.000000) translate(-11.226532, -10.786571) "></path>
        </g>
    </g>
-</svg>
+</svg>
@@ -10,4 +10,4 @@
            </g>
        </g>
    </g>
-</svg>
+</svg>
@@ -714,4 +714,4 @@ namespace AzToolsFramework

 }   //  namespace AzToolsFramework

-#include "UI/SearchWidget/moc_SearchCriteriaWidget.cpp"
+#include "UI/SearchWidget/moc_SearchCriteriaWidget.cpp"
@@ -151,4 +151,4 @@ Q_SIGNALS:
    };

    using FilterByCategoryMap = AZStd::unordered_map<AZStd::string, QRegExp>;
-} // namespace AzToolsFramework
+} // namespace AzToolsFramework
@@ -18,4 +18,4 @@ namespace AzToolsFramework
        And,
        Or
    };
-}   //  namespace AzToolsFramework
+}   //  namespace AzToolsFramework
@@ -27,4 +27,4 @@ namespace AzToolsFramework
    };

    using SliceRelationshipRequestBus = AZ::EBus<SliceRelationshipRequests>;
-}
+}
@@ -42,4 +42,4 @@ namespace AzToolsFramework
    };
 }

-#endif
+#endif
@@ -49,4 +49,4 @@ namespace AzToolsFramework
    };
 }

-#endif
+#endif
@@ -42,4 +42,4 @@ namespace AzToolsFramework
    };
 } // namespace AzToolsFramework

-#endif //COLOR_PICKER_DELEGATE_HXX
+#endif //COLOR_PICKER_DELEGATE_HXX
@@ -56,4 +56,4 @@ namespace AzToolsFramework

        bool m_mouseOver;
    };
-}
+}
@@ -52,4 +52,4 @@ namespace AzToolsFramework
    };
 }

-#endif
+#endif
@@ -152,4 +152,4 @@ namespace AzToolsFramework
        virtual void ApplySnapshot(QTreeView* treeView) = 0;
    };

-} //namespace AzToolsFramework
+} //namespace AzToolsFramework
@@ -46,4 +46,4 @@ namespace AzToolsFramework
                ->Field("m_windowGeometry", &QWidgetSavedState::m_windowGeometry);
        }
    }
-}
+}
@@ -44,4 +44,4 @@ namespace AzToolsFramework
    };
 }

-#endif
+#endif