Skip to content

Commit 3bb1545

Browse files
author
mkrebser
committed
Unity 2023.2 Build support
1 parent b30b933 commit 3bb1545

File tree

9 files changed

+154
-68
lines changed

9 files changed

+154
-68
lines changed

‎Assets/Demos/animtexturedemo/male_sprite.png.meta

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

‎Assets/Demos/billboarddemo/Explosion.png.meta

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

‎Assets/Editor/GPUInstance/scripts/EditorGPUInstanceAnimComposer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ void OnGUI()
9595
}
9696
var animator = animators[0];
9797

98-
var scene_anims = GameObject.FindObjectsOfType<Animator>();
98+
var scene_anims = GameObject.FindObjectsByType<Animator>(FindObjectsSortMode.None);
9999
if (scene_anims == null || scene_anims.All(x => x != animator))
100100
{
101101
Debug.LogWarning(string.Format("[Editor GPU Anim Error] Object: [{0}] must be loaded in the scene hierarchy!", model.name == null ? "" : model.name));
@@ -145,7 +145,7 @@ void OnGUI()
145145
return;
146146
}
147147

148-
var scene_transforms = new HashSet<Transform>(GameObject.FindObjectsOfType<Transform>());
148+
var scene_transforms = new HashSet<Transform>(GameObject.FindObjectsByType<Transform>(FindObjectsSortMode.None));
149149
var model_transforms = model.GetComponentsInChildren<Transform>();
150150
if (model_transforms.Any(x => !scene_transforms.Contains(x)))
151151
{

‎Packages/manifest.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
4-
"com.unity.collab-proxy": "1.3.9",
5-
"com.unity.ext.nunit": "1.0.6",
6-
"com.unity.ide.rider": "3.0.4",
7-
"com.unity.ide.visualstudio": "2.0.7",
8-
"com.unity.ide.vscode": "1.2.3",
9-
"com.unity.test-framework": "1.1.22",
10-
"com.unity.textmeshpro": "3.0.3",
11-
"com.unity.timeline": "1.5.2",
12-
"com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.21-preview",
13-
"com.unity.ugui": "1.0.0",
4+
"com.unity.ai.navigation": "2.0.0",
5+
"com.unity.collab-proxy": "2.2.0",
6+
"com.unity.ext.nunit": "2.0.5",
7+
"com.unity.ide.rider": "3.0.26",
8+
"com.unity.ide.visualstudio": "2.0.22",
9+
"com.unity.test-framework": "1.3.9",
10+
"com.unity.timeline": "1.8.6",
11+
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.4",
12+
"com.unity.ugui": "2.0.0",
13+
"com.unity.modules.accessibility": "1.0.0",
1414
"com.unity.modules.ai": "1.0.0",
1515
"com.unity.modules.androidjni": "1.0.0",
1616
"com.unity.modules.animation": "1.0.0",

‎Packages/packages-lock.json

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6,83 +6,76 @@
66
"source": "builtin",
77
"dependencies": {}
88
},
9+
"com.unity.ai.navigation": {
10+
"version": "2.0.0",
11+
"depth": 0,
12+
"source": "registry",
13+
"dependencies": {
14+
"com.unity.modules.ai": "1.0.0"
15+
},
16+
"url": "https://packages.unity.com"
17+
},
918
"com.unity.collab-proxy": {
10-
"version": "1.3.9",
19+
"version": "2.2.0",
1120
"depth": 0,
1221
"source": "registry",
1322
"dependencies": {},
1423
"url": "https://packages.unity.com"
1524
},
1625
"com.unity.ext.nunit": {
17-
"version": "1.0.6",
26+
"version": "2.0.5",
1827
"depth": 0,
1928
"source": "registry",
2029
"dependencies": {},
2130
"url": "https://packages.unity.com"
2231
},
2332
"com.unity.ide.rider": {
24-
"version": "3.0.4",
33+
"version": "3.0.26",
2534
"depth": 0,
2635
"source": "registry",
2736
"dependencies": {
28-
"com.unity.test-framework": "1.1.1"
37+
"com.unity.ext.nunit": "1.0.6"
2938
},
3039
"url": "https://packages.unity.com"
3140
},
3241
"com.unity.ide.visualstudio": {
33-
"version": "2.0.7",
42+
"version": "2.0.22",
3443
"depth": 0,
3544
"source": "registry",
3645
"dependencies": {
3746
"com.unity.test-framework": "1.1.9"
3847
},
3948
"url": "https://packages.unity.com"
4049
},
41-
"com.unity.ide.vscode": {
42-
"version": "1.2.3",
43-
"depth": 0,
44-
"source": "registry",
45-
"dependencies": {},
46-
"url": "https://packages.unity.com"
47-
},
4850
"com.unity.sysroot": {
49-
"version": "0.1.19-preview",
51+
"version": "2.0.5",
5052
"depth": 1,
5153
"source": "registry",
5254
"dependencies": {},
5355
"url": "https://packages.unity.com"
5456
},
5557
"com.unity.sysroot.linux-x86_64": {
56-
"version": "0.1.14-preview",
58+
"version": "2.0.4",
5759
"depth": 1,
5860
"source": "registry",
5961
"dependencies": {
60-
"com.unity.sysroot": "0.1.18-preview"
62+
"com.unity.sysroot": "2.0.5"
6163
},
6264
"url": "https://packages.unity.com"
6365
},
6466
"com.unity.test-framework": {
65-
"version": "1.1.22",
67+
"version": "1.3.9",
6668
"depth": 0,
6769
"source": "registry",
6870
"dependencies": {
69-
"com.unity.ext.nunit": "1.0.6",
71+
"com.unity.ext.nunit": "2.0.3",
7072
"com.unity.modules.imgui": "1.0.0",
7173
"com.unity.modules.jsonserialize": "1.0.0"
7274
},
7375
"url": "https://packages.unity.com"
7476
},
75-
"com.unity.textmeshpro": {
76-
"version": "3.0.3",
77-
"depth": 0,
78-
"source": "registry",
79-
"dependencies": {
80-
"com.unity.ugui": "1.0.0"
81-
},
82-
"url": "https://packages.unity.com"
83-
},
8477
"com.unity.timeline": {
85-
"version": "1.5.2",
78+
"version": "1.8.6",
8679
"depth": 0,
8780
"source": "registry",
8881
"dependencies": {
@@ -94,24 +87,30 @@
9487
"url": "https://packages.unity.com"
9588
},
9689
"com.unity.toolchain.win-x86_64-linux-x86_64": {
97-
"version": "0.1.21-preview",
90+
"version": "2.0.4",
9891
"depth": 0,
9992
"source": "registry",
10093
"dependencies": {
101-
"com.unity.sysroot": "0.1.19-preview",
102-
"com.unity.sysroot.linux-x86_64": "0.1.14-preview"
94+
"com.unity.sysroot": "2.0.5",
95+
"com.unity.sysroot.linux-x86_64": "2.0.4"
10396
},
10497
"url": "https://packages.unity.com"
10598
},
10699
"com.unity.ugui": {
107-
"version": "1.0.0",
100+
"version": "2.0.0",
108101
"depth": 0,
109102
"source": "builtin",
110103
"dependencies": {
111104
"com.unity.modules.ui": "1.0.0",
112105
"com.unity.modules.imgui": "1.0.0"
113106
}
114107
},
108+
"com.unity.modules.accessibility": {
109+
"version": "1.0.0",
110+
"depth": 0,
111+
"source": "builtin",
112+
"dependencies": {}
113+
},
115114
"com.unity.modules.ai": {
116115
"version": "1.0.0",
117116
"depth": 0,
@@ -159,6 +158,12 @@
159158
"com.unity.modules.animation": "1.0.0"
160159
}
161160
},
161+
"com.unity.modules.hierarchycore": {
162+
"version": "1.0.0",
163+
"depth": 1,
164+
"source": "builtin",
165+
"dependencies": {}
166+
},
162167
"com.unity.modules.imageconversion": {
163168
"version": "1.0.0",
164169
"depth": 0,
@@ -248,17 +253,7 @@
248253
"com.unity.modules.ui": "1.0.0",
249254
"com.unity.modules.imgui": "1.0.0",
250255
"com.unity.modules.jsonserialize": "1.0.0",
251-
"com.unity.modules.uielementsnative": "1.0.0"
252-
}
253-
},
254-
"com.unity.modules.uielementsnative": {
255-
"version": "1.0.0",
256-
"depth": 1,
257-
"source": "builtin",
258-
"dependencies": {
259-
"com.unity.modules.ui": "1.0.0",
260-
"com.unity.modules.imgui": "1.0.0",
261-
"com.unity.modules.jsonserialize": "1.0.0"
256+
"com.unity.modules.hierarchycore": "1.0.0"
262257
}
263258
},
264259
"com.unity.modules.umbra": {

0 commit comments

Comments
 (0)