Skip to content

[10.x.x] Hide warnings about mismatched particle normals #2253

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
ellioman wants to merge 1 commit into from
Closed

[10.x.x] Hide warnings about mismatched particle normals #2253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 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 @@ -4,6 +4,10 @@ All notable changes to this package will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [10.1.1] - 2020-10-16
### Fixed
- Removed the warning about mis-matched vertex streams when creating a default Particle System. [case 1285272](https://issuetracker.unity3d.com/issues/particles-urp-default-material-shows-warning-in-inspector)

## [10.1.0] - 2020-10-12
### Added
- Added support for the Shadowmask Mixed Lighting Mode (Forward only), which supports up to four baked-shadow Lights.
Expand Down
20 changes: 18 additions & 2 deletions com.unity.render-pipelines.universal/Editor/ShaderGUI/ParticleGUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,9 @@ public static void DoVertexStreamsArea(Material material, List<ParticleSystemRen

bool streamsValid;
if (useGPUInstancing && renderer.renderMode == ParticleSystemRenderMode.Mesh && renderer.supportsMeshInstancing)
streamsValid = rendererStreams.SequenceEqual(instancedStreams);
streamsValid = CompareVertexStreams(rendererStreams, instancedStreams);
else
streamsValid = rendererStreams.SequenceEqual(streams);
streamsValid = CompareVertexStreams(rendererStreams, instancedStreams);

if (!streamsValid)
Warnings += "-" + renderer.name + "\n";
Expand All @@ -346,6 +346,22 @@ public static void DoVertexStreamsArea(Material material, List<ParticleSystemRen
}
}

private static bool CompareVertexStreams(IEnumerable<ParticleSystemVertexStream> a, IEnumerable<ParticleSystemVertexStream> b)
{
var differenceA = a.Except(b);
var differenceB = b.Except(a);
var difference = differenceA.Union(differenceB).Distinct();
if (!difference.Any())
return true;
// If normals are the only difference, ignore them, because the default particle streams include normals, to make it easy for users to switch between lit and unlit
if (difference.Count() == 1)
{
if (difference.First() == ParticleSystemVertexStream.Normal)
return true;
}
return false;
}

public static void SetMaterialKeywords(Material material)
{
// Setup particle + material color blending
Expand Down