merge from main

This commit is contained in:
greerdv
2021-05-19 12:14:25 +01:00
11816 changed files with 189923 additions and 1002401 deletions
@@ -45,4 +45,4 @@ namespace Camera
AZ::Vector3 m_positionalOffset = AZ::Vector3::CreateZero();
bool m_isRelativeOffset = false;
};
} // namespace Camera
} // namespace Camera
@@ -51,4 +51,4 @@ namespace Camera
float m_maximumPositiveSlideDistance = 0.0f;
float m_maximumNegativeSlideDistance = 0.0f;
};
} // namespace Camera
} // namespace Camera