Integrating github/staging through commit ef88e6e

2021-04-16 12:05:11 -07:00
parent 9c4d8513f1
commit 10faddb113
60 changed files with 2959 additions and 1246 deletions
@@ -268,8 +268,6 @@ private:
    bool SetDrawInFrontMode(bool bOn) override;
    AZ::u32 GetState() override;
    AZ::u32 SetState(AZ::u32 state) override;
-    AZ::u32 SetStateFlag(AZ::u32 state) override;
-    AZ::u32 ClearStateFlag(AZ::u32 state) override;
    void PushMatrix(const AZ::Transform& tm) override;
    void PopMatrix() override;