Skip to content
This repository was archived by the owner on Apr 29, 2021. It is now read-only.

Commit 4a59076

Browse files
authored
Merge pull request #307 from UnityTech/master
release stable version 1.5.4
2 parents 8aee96e + a18c738 commit 4a59076

File tree

73 files changed

+1350
-138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1350
-138
lines changed
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
#import <UIKit/UIKit.h>
2+
#import "UIWidgetsDevice.h"
23
extern "C"
34
{
4-
int IOSDeviceScaleFactor()
5+
float IOSDeviceScaleFactor()
56
{
6-
return [[UIScreen mainScreen] scale];
7+
float scale = [[UIScreen mainScreen] scale] * 1.0;
8+
if ([UIWidgetsDevice NeedScreenDownSample]) {
9+
scale *= 0.8696;
10+
}
11+
return scale;
712
}
813
}

Runtime/Resources/UIWidgets_GUITexture.shader.meta

Lines changed: 0 additions & 3 deletions
This file was deleted.

Runtime/Resources/shaders.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Runtime/Resources/shaders/UIWidgets_GUITexture.shader.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Runtime/Resources/UIWidgets_UIDefault.shader.meta renamed to Runtime/Resources/shaders/UIWidgets_UIDefault.shader.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Runtime/Resources/UIWidgets_canvas.cginc.meta renamed to Runtime/Resources/shaders/UIWidgets_canvas.cginc.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)