Merge branch 'main' into LYN-1099

This commit is contained in:
jjjoness
2021-04-23 09:55:17 +01:00
613 changed files with 3851 additions and 4639 deletions
-15
View File
@@ -77,19 +77,6 @@ namespace AzToolsFramework
// Subclassing so we can add slots to our toolbar widgets
// Using lambdas is crashy since the lamdba doesn't know when the widget is deleted.
class RefCoordComboBox
: public QComboBox
{
Q_OBJECT
public:
explicit RefCoordComboBox(QWidget* parent);
public Q_SLOTS:
void ToggleRefCoordSys();
void UpdateRefCoordSys();
private:
QStringList coordSysList() const;
};
class UndoRedoToolButton
: public QToolButton
{
@@ -230,8 +217,6 @@ private:
QWidget* CreateSnapToAngleWidget();
QWidget* CreateSpacerRightWidget();
QComboBox* CreateRefCoordComboBox();
QToolButton* CreateUndoRedoButton(int command);
QToolButton* CreateEnvironmentModeButton();