birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into Atom/guthadam/multiple_dockable_pinned_material_component_property_editors

Browse Source
This commit is contained in:
Guthrie Adams
2021-09-15 16:44:39 -05:00
parent ce29eeb378 b2445ebe0c
commit 1e1f1b6aee
516 changed files with 4591 additions and 2787 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
+1 -1
View File
@@ -118,7 +118,7 @@ namespace AtomToolsFramework
void ToggleFullScreenState() override;
float GetDpiScaleFactor() const override;
uint32_t GetSyncInterval() const override;
uint32_t GetDisplayRefreshRate() const;
uint32_t GetDisplayRefreshRate() const override;
protected:
// AzFramework::InputChannelEventListener ...