Merge remote-tracking branch 'origin/master' into 1.10
# Conflicts: # Source/Engine/Level/Prefabs/Prefab.Apply.cpp
This commit is contained in:
@@ -30,7 +30,7 @@ DECLARE_SCRIPTING_TYPE_NO_SPAWN(Screen);
|
||||
API_PROPERTY() static void SetIsFullscreen(bool value);
|
||||
|
||||
/// <summary>
|
||||
/// Gets the window size.
|
||||
/// Gets the window size (in screen-space, includes DPI scale).
|
||||
/// </summary>
|
||||
/// <returns>The value</returns>
|
||||
API_PROPERTY() static Float2 GetSize();
|
||||
@@ -50,7 +50,7 @@ DECLARE_SCRIPTING_TYPE_NO_SPAWN(Screen);
|
||||
API_FUNCTION() static Float2 GameViewportToScreen(const Float2& viewportPos);
|
||||
|
||||
/// <summary>
|
||||
/// Sets the window size.
|
||||
/// Sets the window size (in screen-space, includes DPI scale).
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Resizing may not happen immediately. It will be performed before next frame rendering.
|
||||
|
||||
Reference in New Issue
Block a user