Skip to content

Fix material ui nullref #982

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 3 commits into from
Jun 19, 2020
Merged

Fix material ui nullref #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cf8c91
Fixed Receive SSR transparent nullref
alelievr Jun 19, 2020
dc97a6b
Fixed terrain and axf nullref
alelievr Jun 19, 2020
944cfac
Updated changelog
alelievr Jun 19, 2020
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.high-definition/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed ray tracing with XR single-pass.
- Fixed warning in HDAdditionalLightData OnValidate (cases 1250864, 1244578)
- Fixed a bug related to denoising ray traced reflections.
- Fixed nullref in the layered lit material inspector.

### Changed
- Improve MIP selection for decals on Transparents
Expand Down
4 changes: 2 additions & 2 deletions com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ void DrawSurfaceGUI()
else // SurfaceType.Opaque
{
EditorGUI.indentLevel++;
if (doubleSidedEnable.floatValue == 0)
if (doubleSidedEnable != null && doubleSidedEnable.floatValue == 0 && opaqueCullMode != null)
materialEditor.ShaderProperty(opaqueCullMode, Styles.opaqueCullModeText);
EditorGUI.indentLevel--;
if (HDRenderQueue.k_RenderQueue_AfterPostProcessOpaque.Contains(renderQueue))
Expand Down Expand Up @@ -747,7 +747,7 @@ void DrawLitSurfaceOptions()
materialEditor.ShaderProperty(supportDecals, Styles.supportDecalsText);
}

if (receivesSSR != null)
if (receivesSSR != null && receivesSSRTransparent != null)
{
// Based on the surface type, display the right recieveSSR option
if (surfaceTypeValue == SurfaceType.Transparent)
Expand Down