Skip to content

Commit e927d00

Browse files
committed
Disabled "Baked Global Illumination" option in scenes
1 parent 3bedda2 commit e927d00

File tree

6 files changed

+702
-3098
lines changed

6 files changed

+702
-3098
lines changed

testproject/Assets/Samples/Physics/PhysiscSampleLightingSettings.lighting

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ LightingSettings:
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
99
m_Name: PhysiscSampleLightingSettings
10-
serializedVersion: 3
10+
serializedVersion: 4
1111
m_GIWorkflowMode: 0
12-
m_EnableBakedLightmaps: 1
12+
m_EnableBakedLightmaps: 0
1313
m_EnableRealtimeLightmaps: 0
1414
m_RealtimeEnvironmentLighting: 1
1515
m_BounceScale: 1
@@ -20,7 +20,7 @@ LightingSettings:
2020
m_LightmapMaxSize: 1024
2121
m_BakeResolution: 40
2222
m_Padding: 2
23-
m_TextureCompression: 1
23+
m_LightmapCompression: 3
2424
m_AO: 0
2525
m_AOMaxDistance: 1
2626
m_CompAOExponent: 1
@@ -61,3 +61,4 @@ LightingSettings:
6161
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
6262
m_PVRFilteringAtrousPositionSigmaIndirect: 2
6363
m_PVRFilteringAtrousPositionSigmaAO: 1
64+
m_PVRTiledBaking: 0

testproject/Assets/Samples/PrefabPool/PrefabPoolExample.unity

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
4241
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
@@ -396,6 +395,7 @@ Canvas:
396395
m_OverrideSorting: 0
397396
m_OverridePixelPerfect: 0
398397
m_SortingBucketNormalizedSize: 0
398+
m_VertexColorAlwaysGammaSpace: 0
399399
m_AdditionalShaderChannelsFlag: 0
400400
m_SortingLayerID: 0
401401
m_SortingOrder: 0
@@ -497,6 +497,7 @@ Canvas:
497497
m_OverrideSorting: 0
498498
m_OverridePixelPerfect: 0
499499
m_SortingBucketNormalizedSize: 0
500+
m_VertexColorAlwaysGammaSpace: 0
500501
m_AdditionalShaderChannelsFlag: 0
501502
m_SortingLayerID: 0
502503
m_SortingOrder: 0
@@ -795,7 +796,7 @@ LightingSettings:
795796
m_Name:
796797
serializedVersion: 4
797798
m_GIWorkflowMode: 1
798-
m_EnableBakedLightmaps: 1
799+
m_EnableBakedLightmaps: 0
799800
m_EnableRealtimeLightmaps: 0
800801
m_RealtimeEnvironmentLighting: 1
801802
m_BounceScale: 1
@@ -1008,13 +1009,16 @@ MonoBehaviour:
10081009
m_Name:
10091010
m_EditorClassIdentifier:
10101011
GlobalObjectIdHash: 3000067655
1012+
InScenePlacedSourceGlobalObjectIdHash: 0
10111013
AlwaysReplicateAsRoot: 0
10121014
SynchronizeTransform: 1
10131015
ActiveSceneSynchronization: 0
10141016
SceneMigrationSynchronization: 1
10151017
SpawnWithObservers: 1
10161018
DontDestroyWithOwner: 0
10171019
AutoObjectParentSync: 1
1020+
SyncOwnerTransformWhenParented: 1
1021+
AllowOwnerToParent: 0
10181022
--- !u!1 &1332123091
10191023
GameObject:
10201024
m_ObjectHideFlags: 0
@@ -1809,13 +1813,16 @@ MonoBehaviour:
18091813
m_Name:
18101814
m_EditorClassIdentifier:
18111815
GlobalObjectIdHash: 2806511234
1816+
InScenePlacedSourceGlobalObjectIdHash: 0
18121817
AlwaysReplicateAsRoot: 0
18131818
SynchronizeTransform: 1
18141819
ActiveSceneSynchronization: 0
18151820
SceneMigrationSynchronization: 1
18161821
SpawnWithObservers: 1
18171822
DontDestroyWithOwner: 0
18181823
AutoObjectParentSync: 1
1824+
SyncOwnerTransformWhenParented: 1
1825+
AllowOwnerToParent: 0
18191826
--- !u!1001 &2848221156282925290
18201827
PrefabInstance:
18211828
m_ObjectHideFlags: 0

testproject/Assets/Samples/PrefabPool/PrefabPoolOverrideExample.unity

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
4241
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
@@ -396,6 +395,7 @@ Canvas:
396395
m_OverrideSorting: 0
397396
m_OverridePixelPerfect: 0
398397
m_SortingBucketNormalizedSize: 0
398+
m_VertexColorAlwaysGammaSpace: 0
399399
m_AdditionalShaderChannelsFlag: 0
400400
m_SortingLayerID: 0
401401
m_SortingOrder: 0
@@ -497,6 +497,7 @@ Canvas:
497497
m_OverrideSorting: 0
498498
m_OverridePixelPerfect: 0
499499
m_SortingBucketNormalizedSize: 0
500+
m_VertexColorAlwaysGammaSpace: 0
500501
m_AdditionalShaderChannelsFlag: 0
501502
m_SortingLayerID: 0
502503
m_SortingOrder: 0
@@ -795,7 +796,7 @@ LightingSettings:
795796
m_Name:
796797
serializedVersion: 4
797798
m_GIWorkflowMode: 1
798-
m_EnableBakedLightmaps: 1
799+
m_EnableBakedLightmaps: 0
799800
m_EnableRealtimeLightmaps: 0
800801
m_RealtimeEnvironmentLighting: 1
801802
m_BounceScale: 1
@@ -1020,13 +1021,16 @@ MonoBehaviour:
10201021
m_Name:
10211022
m_EditorClassIdentifier:
10221023
GlobalObjectIdHash: 3569926023
1024+
InScenePlacedSourceGlobalObjectIdHash: 0
10231025
AlwaysReplicateAsRoot: 0
10241026
SynchronizeTransform: 1
10251027
ActiveSceneSynchronization: 0
10261028
SceneMigrationSynchronization: 1
10271029
SpawnWithObservers: 1
10281030
DontDestroyWithOwner: 0
10291031
AutoObjectParentSync: 1
1032+
SyncOwnerTransformWhenParented: 1
1033+
AllowOwnerToParent: 0
10301034
--- !u!1 &1332123091
10311035
GameObject:
10321036
m_ObjectHideFlags: 0
@@ -1821,13 +1825,16 @@ MonoBehaviour:
18211825
m_Name:
18221826
m_EditorClassIdentifier:
18231827
GlobalObjectIdHash: 4056472094
1828+
InScenePlacedSourceGlobalObjectIdHash: 0
18241829
AlwaysReplicateAsRoot: 0
18251830
SynchronizeTransform: 1
18261831
ActiveSceneSynchronization: 0
18271832
SceneMigrationSynchronization: 1
18281833
SpawnWithObservers: 1
18291834
DontDestroyWithOwner: 0
18301835
AutoObjectParentSync: 1
1836+
SyncOwnerTransformWhenParented: 1
1837+
AllowOwnerToParent: 0
18311838
--- !u!1001 &2848221156282925290
18321839
PrefabInstance:
18331840
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)