Skip to content

Conversation

@PaulDemeulenaere
Copy link
Contributor

@PaulDemeulenaere PaulDemeulenaere commented Jan 22, 2021

Purpose of this PR

Batch of backport :


Testing status

  • Manual Standalone, PlayMode & EditMode
  • Yamato ⏳

Comments to reviewers

We had to update test using shadow due to a slightly change, this issue was already on 7.x.x/release (see here)

PaulDemeulenaere and others added 8 commits January 22, 2021 09:15
* Trick ExcludeFromPreset

Since this attribute is declared with "Inherited = false", we can't use it directly on VFXObject.
Extend the VFXInfo is valid to filter out preset.

* Fix missing ExcludeFromPreset for subgraph

* *Update changelog
# Conflicts:
#	com.unity.visualeffectgraph/CHANGELOG.md
* Base Commit

* Updated Documentation with explicit limitations.

* Fixed incorrect Merge

* Add regression Test

* Removed Test as It can't handle Exceptions thrown in Custom Importers

* Fixed value divider

Co-authored-by: Thomas ICHÉ <[email protected]>
# Conflicts:
#	com.unity.visualeffectgraph/CHANGELOG.md
* Update Pass.template

* Update CHANGELOG.md
# Conflicts:
#	com.unity.visualeffectgraph/CHANGELOG.md
* Prevent pasting context within operator/block subgraph

* Fix case https://github.cds.internal.unity3d.com/unity/vfx-graphics/pull/191#discussion_r102007

Fix Approximate english log warning

* Update VFXPaste log message

Missing "the"
# Conflicts:
#	com.unity.visualeffectgraph/CHANGELOG.md
* Fix missing call to CreateVFXEventAttribute

OnValidate is only called in editor, in runtime, we should init cache data with OnEnable

* *Update changelog.md
Slightly diff which probably comes from a change in trunk
@PaulDemeulenaere PaulDemeulenaere marked this pull request as ready for review January 22, 2021 11:30
@PaulDemeulenaere
Copy link
Contributor Author

@julienf-unity all VFX job are green, other failing are also in target branch, see 3e8aa97

@julienf-unity julienf-unity merged commit 025816c into 7.x.x/release Jan 22, 2021
@julienf-unity julienf-unity deleted the 7.x.x/vfx/staging-for-7-5-3 branch January 22, 2021 18:44
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