Merge remote-tracking branch 'origin/gi' into large-worlds
# Conflicts: # Source/Engine/Core/Math/Vector3.h
This commit is contained in:
@@ -313,7 +313,7 @@ namespace FlaxEngine.GUI
|
||||
/// <summary>
|
||||
/// Gets the control DPI scale factor (1 is default). Includes custom DPI scale.
|
||||
/// </summary>
|
||||
public float DpiScale => RootWindow?.Window.DpiScale ?? Platform.DpiScale;
|
||||
public float DpiScale => RootWindow?.Window?.DpiScale ?? Platform.DpiScale;
|
||||
|
||||
/// <summary>
|
||||
/// Gets screen position of the control (upper left corner).
|
||||
|
||||
Reference in New Issue
Block a user