Skip to content

Conversation

@ellioman
Copy link
Contributor

@ellioman ellioman commented Oct 16, 2020

Purpose of this PR

We always include vertex normals by default when building particle data, so users can switch between lit + unlit shaders without any extra config changes. This causes the standard particle gui to complain, but we should hide this error.


Yamato

https://yamato.cds.internal.unity3d.com/jobs/902-Graphics/tree/universal%252Fparticles-ignore-mismatched-normals

We always include vertex normals by default when building particle data, so users can switch between lit + unlit shaders without any extra config changes.
This causes the standard particle gui to complain, but we should hide this error.
@ellioman ellioman requested review from a user and phi-lira October 16, 2020 08:58
@ellioman ellioman requested a review from a team as a code owner October 16, 2020 08:58
@github-actions
Copy link

It appears that you made a non-draft PR!
Please convert your PR to draft (button on the right side of the page)
and cancel any jobs that started on Yamato.
See the PR template for more information.
Thank you!

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Thanks, that was fast!

@ellioman
Copy link
Contributor Author

Thanks, that was fast!

Well, you had already done all the work :)

phi-lira added a commit that referenced this pull request Oct 26, 2020
commit e5e780c
Author: Elvar Örn Unnþórsson <[email protected]>
Date:   Fri Oct 16 10:53:25 2020 +0200

    Hide warnings about mismatched particle normals

    We always include vertex normals by default when building particle data, so users can switch between lit + unlit shaders without any extra config changes.
    This causes the standard particle gui to complain, but we should hide this error.
@phi-lira phi-lira mentioned this pull request Oct 26, 2020
phi-lira added a commit that referenced this pull request Oct 27, 2020
commit e5e780c
Author: Elvar Örn Unnþórsson <[email protected]>
Date:   Fri Oct 16 10:53:25 2020 +0200

    Hide warnings about mismatched particle normals

    We always include vertex normals by default when building particle data, so users can switch between lit + unlit shaders without any extra config changes.
    This causes the standard particle gui to complain, but we should hide this error.

# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md
phi-lira added a commit that referenced this pull request Oct 27, 2020
* Merge of  #2283

commit 4168f84
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:53:27 2020 -0700

    Fixed typo.
    Updated CHANGELOG.md

commit d9b0581
Merge: 53b2082 8bc58a4
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:50:33 2020 -0700

    Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/fix-mirror-view-convention

commit 53b2082
Author: thomas-zeng <[email protected]>
Date:   Mon Oct 19 16:47:33 2020 -0700

    Fixed mirror view shader reading wrong viewport region from the eye textures.

* Merge of #2253

commit e5e780c
Author: Elvar Örn Unnþórsson <[email protected]>
Date:   Fri Oct 16 10:53:25 2020 +0200

    Hide warnings about mismatched particle normals

    We always include vertex normals by default when building particle data, so users can switch between lit + unlit shaders without any extra config changes.
    This causes the standard particle gui to complain, but we should hide this error.

# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md

* Merge of #2222

commit bfb132b
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 13 16:45:52 2020 -0700

    Fixed camera matrix not restored after modification.

* Merge of #2284

commit 502a242
Merge: 2c742d8 acaf95d
Author: Nigel John Williams <[email protected]>
Date:   Thu Oct 22 13:30:58 2020 +0200

    Merge branch 'master' into universal/sun-source-light-type

commit 2c742d8
Merge: 00042cb 4acb87d
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:52:38 2020 +0200

    Merge branch 'master' into universal/sun-source-light-type

commit 00042cb
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:16:20 2020 +0200

    Fix sun source warning text

    Changed sun source warning message to explicitly specify light window's environment settings.

commit 489e90f
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:00:56 2020 +0200

    Fix code comment about sun light

    Corrected legacy code comment about sun light for selection of main light.

commit 51e3147
Author: Nigel John Williams <[email protected]>
Date:   Fri Oct 16 16:50:03 2020 +0200

    Restrict sun source to only directional lights and display warning message if user changes the sun light type.

* Merge of #2135

commit 6633ec9
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 20 16:30:22 2020 -0700

    Updated CHANGELOG.md.

commit 7078aa1
Merge: a706832 52ec802
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 20 16:28:14 2020 -0700

    Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/clamp-msaa

commit a706832
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 8 10:34:38 2020 -0700

    Added next power of 2 logic and clamp logic to XR msaa setter.

* Added missing changelog for #2284

Co-authored-by: Nigel John Williams <[email protected]>
@phi-lira
Copy link
Contributor

Closing, merged in : #2390

@phi-lira phi-lira closed this Oct 27, 2020
phi-lira added a commit that referenced this pull request Oct 27, 2020
* Merge of  #2283

commit 4168f84
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:53:27 2020 -0700

    Fixed typo.
    Updated CHANGELOG.md

commit d9b0581
Merge: 53b2082 8bc58a4
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:50:33 2020 -0700

    Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/fix-mirror-view-convention

commit 53b2082
Author: thomas-zeng <[email protected]>
Date:   Mon Oct 19 16:47:33 2020 -0700

    Fixed mirror view shader reading wrong viewport region from the eye textures.

* Merge of #2253

commit e5e780c
Author: Elvar Örn Unnþórsson <[email protected]>
Date:   Fri Oct 16 10:53:25 2020 +0200

    Hide warnings about mismatched particle normals

    We always include vertex normals by default when building particle data, so users can switch between lit + unlit shaders without any extra config changes.
    This causes the standard particle gui to complain, but we should hide this error.

# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md

* Merge of #2222

commit bfb132b
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 13 16:45:52 2020 -0700

    Fixed camera matrix not restored after modification.

* Merge of #2284

commit 502a242
Merge: 2c742d8 acaf95d
Author: Nigel John Williams <[email protected]>
Date:   Thu Oct 22 13:30:58 2020 +0200

    Merge branch 'master' into universal/sun-source-light-type

commit 2c742d8
Merge: 00042cb 4acb87d
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:52:38 2020 +0200

    Merge branch 'master' into universal/sun-source-light-type

commit 00042cb
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:16:20 2020 +0200

    Fix sun source warning text

    Changed sun source warning message to explicitly specify light window's environment settings.

commit 489e90f
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:00:56 2020 +0200

    Fix code comment about sun light

    Corrected legacy code comment about sun light for selection of main light.

commit 51e3147
Author: Nigel John Williams <[email protected]>
Date:   Fri Oct 16 16:50:03 2020 +0200

    Restrict sun source to only directional lights and display warning message if user changes the sun light type.

* Merge of #2135

commit 6633ec9
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 20 16:30:22 2020 -0700

    Updated CHANGELOG.md.

commit 7078aa1
Merge: a706832 52ec802
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 20 16:28:14 2020 -0700

    Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/clamp-msaa

commit a706832
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 8 10:34:38 2020 -0700

    Added next power of 2 logic and clamp logic to XR msaa setter.

* Added missing changelog for #2284

Co-authored-by: Nigel John Williams <[email protected]>
# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md
phi-lira added a commit that referenced this pull request Oct 27, 2020
* Merge of  #2283

commit 4168f84
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:53:27 2020 -0700

    Fixed typo.
    Updated CHANGELOG.md

commit d9b0581
Merge: 53b2082 8bc58a4
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 22 10:50:33 2020 -0700

    Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/fix-mirror-view-convention

commit 53b2082
Author: thomas-zeng <[email protected]>
Date:   Mon Oct 19 16:47:33 2020 -0700

    Fixed mirror view shader reading wrong viewport region from the eye textures.

* Merge of #2253

commit e5e780c
Author: Elvar Örn Unnþórsson <[email protected]>
Date:   Fri Oct 16 10:53:25 2020 +0200

    Hide warnings about mismatched particle normals

    We always include vertex normals by default when building particle data, so users can switch between lit + unlit shaders without any extra config changes.
    This causes the standard particle gui to complain, but we should hide this error.

# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md

* Merge of #2222

commit bfb132b
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 13 16:45:52 2020 -0700

    Fixed camera matrix not restored after modification.

* Merge of #2284

commit 502a242
Merge: 2c742d8 acaf95d
Author: Nigel John Williams <[email protected]>
Date:   Thu Oct 22 13:30:58 2020 +0200

    Merge branch 'master' into universal/sun-source-light-type

commit 2c742d8
Merge: 00042cb 4acb87d
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:52:38 2020 +0200

    Merge branch 'master' into universal/sun-source-light-type

commit 00042cb
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:16:20 2020 +0200

    Fix sun source warning text

    Changed sun source warning message to explicitly specify light window's environment settings.

commit 489e90f
Author: nigeljw-unity <[email protected]>
Date:   Tue Oct 20 11:00:56 2020 +0200

    Fix code comment about sun light

    Corrected legacy code comment about sun light for selection of main light.

commit 51e3147
Author: Nigel John Williams <[email protected]>
Date:   Fri Oct 16 16:50:03 2020 +0200

    Restrict sun source to only directional lights and display warning message if user changes the sun light type.

* Merge of #2135

commit 6633ec9
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 20 16:30:22 2020 -0700

    Updated CHANGELOG.md.

commit 7078aa1
Merge: a706832 52ec802
Author: thomas-zeng <[email protected]>
Date:   Tue Oct 20 16:28:14 2020 -0700

    Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/clamp-msaa

commit a706832
Author: thomas-zeng <[email protected]>
Date:   Thu Oct 8 10:34:38 2020 -0700

    Added next power of 2 logic and clamp logic to XR msaa setter.

* Added missing changelog for #2284

Co-authored-by: Nigel John Williams <[email protected]>
# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md
@sebastienlagarde sebastienlagarde deleted the universal/particles-ignore-mismatched-normals branch September 1, 2021 10:20
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.

4 participants