Skip to content

Fix Undo with added property field for additional lights #2977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 24, 2021
Merged

Fix Undo with added property field for additional lights #2977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1db5756
added property field additional lights rend mode
martint-unity Dec 22, 2020
81f7cc1
updated changelog
martint-unity Dec 22, 2020
b49ebc6
Merge branch 'master' into universal/bugfix/urp-asset-undo-issues
martint-unity Jan 20, 2021
8f3d649
Merge branch 'master' into universal/bugfix/urp-asset-undo-issues
martint-unity Feb 22, 2021
c78839e
Merge branch 'master' into universal/bugfix/urp-asset-undo-issues
martint-unity Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions com.unity.render-pipelines.universal/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed shadow cascade blend culling factor.
- Removed Custom.meta which was causing warnings. [case 1314288](https://issuetracker.unity3d.com/issues/urp-warnings-about-missing-metadata-appear-after-installing)
- Fixed a case where shadow fade was clipped too early.
- Fixed undo issues for the additional light property on the UniversalRenderPipeline Asset. [case 1300367]

### Changed
- Change Asset/Create/Shader/Universal Render Pipeline/Lit Shader Graph to Asset/Create/Shader Graph/URP/Lit Shader Graph
Expand Down
6 changes: 1 addition & 5 deletions com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineAssetEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ internal class Styles

SerializedProperty m_ShaderVariantLogLevel;

LightRenderingMode selectedLightRenderingMode;
SerializedProperty m_ColorGradingMode;
SerializedProperty m_ColorGradingLutSize;
SerializedProperty m_UseFastSRGBLinearConversion;
Expand Down Expand Up @@ -237,8 +236,6 @@ void OnEnable()

m_UseAdaptivePerformance = serializedObject.FindProperty("m_UseAdaptivePerformance");

selectedLightRenderingMode = (LightRenderingMode)m_AdditionalLightsRenderingModeProp.intValue;

string Key = "Universal_Shadow_Setting_Unit:UI_State";
m_State = new EditorPrefBoolFlags<EditorUtils.Unit>(Key);
}
Expand Down Expand Up @@ -326,8 +323,7 @@ void DrawLightingSettings()
EditorGUILayout.Space();

// Additional light
selectedLightRenderingMode = (LightRenderingMode)EditorGUILayout.EnumPopup(Styles.addditionalLightsRenderingModeText, selectedLightRenderingMode);
m_AdditionalLightsRenderingModeProp.intValue = (int)selectedLightRenderingMode;
EditorGUILayout.PropertyField(m_AdditionalLightsRenderingModeProp, Styles.addditionalLightsRenderingModeText);
EditorGUI.indentLevel++;

disableGroup = m_AdditionalLightsRenderingModeProp.intValue == (int)LightRenderingMode.Disabled;
Expand Down