Skip to content

backport pr 2977 undo additional light issue #3186

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

Closed
wants to merge 2 commits into from
Closed

backport pr 2977 undo additional light issue #3186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6818047
backport pr 2977 undo additional light issue
martint-unity Jan 20, 2021
54c954b
Merge branch '10.x.x/release' into 10.x.x/backport-undo-additional-li…
martint-unity Jan 28, 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
3 changes: 3 additions & 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 @@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
Version Updated
The version number for this package has increased due to a version update of a related graphics package.

### Fixed
- Fixed an undo issues for additional light property on the UniversalRenderPipeline Asset.

## [10.3.1] - 2020-01-26

Version Updated
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 @@ -136,7 +136,6 @@ internal class Styles

SerializedProperty m_ShaderVariantLogLevel;

LightRenderingMode selectedLightRenderingMode;
SerializedProperty m_ColorGradingMode;
SerializedProperty m_ColorGradingLutSize;

Expand Down Expand Up @@ -216,8 +215,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 @@ -305,8 +302,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