Skip to content

Commit bae2531

Browse files
committed
Add is application running in edit mode check before assigning resetvalue
1 parent a473e1e commit bae2531

File tree

4 files changed

+20
-36
lines changed

4 files changed

+20
-36
lines changed

Packages/SOVariables/Editor/VariableEditor.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ public override void OnInspectorGUI()
2626
}
2727
else
2828
{
29-
AssignResetValue();
29+
// only assign the reset value if application is not playing -> else code in ScriptableObjects that change the value property will persist because they seem to call OnInspectorGUI
30+
if (!EditorApplication.isPlaying)
31+
{
32+
AssignResetValue();
33+
}
3034
}
3135

3236
serializedObject.ApplyModifiedProperties();

Packages/manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"dependencies": {
3-
"com.unity.collab-proxy": "1.17.7",
3+
"com.unity.collab-proxy": "2.0.0",
44
"com.unity.feature.development": "1.0.1",
5-
"com.unity.ide.rider": "3.0.16",
6-
"com.unity.ide.visualstudio": "2.0.16",
5+
"com.unity.ide.rider": "3.0.18",
6+
"com.unity.ide.visualstudio": "2.0.17",
77
"com.unity.ide.vscode": "1.2.5",
88
"com.unity.test-framework": "1.1.31",
99
"com.unity.textmeshpro": "3.0.6",
1010
"com.unity.timeline": "1.6.4",
1111
"com.unity.ugui": "1.0.0",
12-
"com.unity.visualscripting": "1.7.8",
12+
"com.unity.visualscripting": "1.8.0",
1313
"com.unity.modules.ai": "1.0.0",
1414
"com.unity.modules.androidjni": "1.0.0",
1515
"com.unity.modules.animation": "1.0.0",

Packages/packages-lock.json

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
{
22
"dependencies": {
33
"com.unity.collab-proxy": {
4-
"version": "1.17.7",
4+
"version": "2.0.0",
55
"depth": 0,
66
"source": "registry",
7-
"dependencies": {
8-
"com.unity.services.core": "1.0.1"
9-
},
7+
"dependencies": {},
108
"url": "https://packages.unity.com"
119
},
1210
"com.unity.editorcoroutines": {
@@ -28,17 +26,17 @@
2826
"depth": 0,
2927
"source": "builtin",
3028
"dependencies": {
31-
"com.unity.ide.visualstudio": "2.0.16",
32-
"com.unity.ide.rider": "3.0.16",
29+
"com.unity.ide.visualstudio": "2.0.17",
30+
"com.unity.ide.rider": "3.0.18",
3331
"com.unity.ide.vscode": "1.2.5",
3432
"com.unity.editorcoroutines": "1.0.0",
35-
"com.unity.performance.profile-analyzer": "1.1.1",
33+
"com.unity.performance.profile-analyzer": "1.2.2",
3634
"com.unity.test-framework": "1.1.31",
3735
"com.unity.testtools.codecoverage": "1.2.2"
3836
}
3937
},
4038
"com.unity.ide.rider": {
41-
"version": "3.0.16",
39+
"version": "3.0.18",
4240
"depth": 0,
4341
"source": "registry",
4442
"dependencies": {
@@ -47,7 +45,7 @@
4745
"url": "https://packages.unity.com"
4846
},
4947
"com.unity.ide.visualstudio": {
50-
"version": "2.0.16",
48+
"version": "2.0.17",
5149
"depth": 0,
5250
"source": "registry",
5351
"dependencies": {
@@ -62,31 +60,13 @@
6260
"dependencies": {},
6361
"url": "https://packages.unity.com"
6462
},
65-
"com.unity.nuget.newtonsoft-json": {
66-
"version": "3.0.2",
67-
"depth": 2,
68-
"source": "registry",
69-
"dependencies": {},
70-
"url": "https://packages.unity.com"
71-
},
7263
"com.unity.performance.profile-analyzer": {
73-
"version": "1.1.1",
64+
"version": "1.2.2",
7465
"depth": 1,
7566
"source": "registry",
7667
"dependencies": {},
7768
"url": "https://packages.unity.com"
7869
},
79-
"com.unity.services.core": {
80-
"version": "1.6.0",
81-
"depth": 1,
82-
"source": "registry",
83-
"dependencies": {
84-
"com.unity.modules.unitywebrequest": "1.0.0",
85-
"com.unity.nuget.newtonsoft-json": "3.0.2",
86-
"com.unity.modules.androidjni": "1.0.0"
87-
},
88-
"url": "https://packages.unity.com"
89-
},
9070
"com.unity.settings-manager": {
9171
"version": "1.0.3",
9272
"depth": 2,
@@ -146,7 +126,7 @@
146126
}
147127
},
148128
"com.unity.visualscripting": {
149-
"version": "1.7.8",
129+
"version": "1.8.0",
150130
"depth": 0,
151131
"source": "registry",
152132
"dependencies": {

ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.3.15f1
2-
m_EditorVersionWithRevision: 2021.3.15f1 (e8e88683f834)
1+
m_EditorVersion: 2021.3.19f1
2+
m_EditorVersionWithRevision: 2021.3.19f1 (c9714fde33b6)

0 commit comments

Comments
 (0)