Skip to content

Conversation

eh-unity
Copy link
Contributor

@eh-unity eh-unity commented Dec 3, 2021

Purpose of this PR

Fix URP shader resource reload paths.


Testing status

Manually tested URP EditorResources "Reload All". No errors after this fix.

@eh-unity eh-unity marked this pull request as ready for review December 3, 2021 15:39
@eh-unity eh-unity requested review from a team as code owners December 3, 2021 15:39
@github-actions
Copy link

github-actions bot commented Dec 3, 2021

Hi! This comment will help you figure out which jobs to run before merging your PR. The suggestions are dynamic based on what files you have changed.
Link to Yamato: https://unity-ci.cds.internal.unity3d.com/project/902/
Search for your PR branch using the search bar at the top, then add the following segment(s) to the end of the URL (you may need multiple tabs depending on how many packages you change)

URP
/jobDefinition/.yamato%252Fall-urp.yml%2523PR_URP_trunk
With changes to URP packages, you should also run
/jobDefinition/.yamato%2Fall-lightmapping.yml%23PR_Lightmapping_trunk

Depending on the scope of your PR, you may need to run more jobs than what has been suggested. Please speak to your lead or a Graphics SDET (#devs-graphics-automation) if you are unsure.

Comment on lines +41 to +44
// particleLit is the URP default material for new particle systems.
// ParticlesUnlit.mat is closest match to the built-in shader.
// This is correct (current 22.2) despite the Lit/Unlit naming conflict.
[Reload("Runtime/Materials/ParticlesUnlit.mat")]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you mean, the ParticlesUnlit.mat uses particles Lit shader?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The resource code has everything named as ParticlesLit, and we return that as a default particle material.
However built-in default particle material is Unlit.
The Unlit material here uses the URP Unlit particle shader correctly.

The confusion here is that we have code named as "Lit" particle material, but it has always been Unlit.
Unlit appears to be correct from the perspective of matching the built-in renderer. There's never been ParticlesLit.mat

@phi-lira
Copy link
Contributor

phi-lira commented Dec 9, 2021

Formatting failure not caused by this PR. VFX failures also on master.

@phi-lira phi-lira changed the base branch from master to universal/staging December 9, 2021 08:50
@phi-lira phi-lira merged commit 2b05daa into universal/staging Dec 9, 2021
@phi-lira phi-lira deleted the universal/fix-shader-paths branch December 9, 2021 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants