Skip to content

Disable subblocks space conversion #2567

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.

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
Nov 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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.visualeffectgraph/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ The version number for this package has increased due to a version update of a r
- Fixed Set Strip Progress Attribute utility block in Additional Samples
- Fix [Case 1255182](https://fogbugz.unity3d.com/f/cases/1255182/)
- Remove temporarily "Exact Fixed Time Step" option on VisualEffectAsset to avoid unexpected behavior
- Disable implicit space transformations in sublock graphs as they led to unexpected behaviors

## [10.1.0] - 2020-10-12
### Added
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public override void CheckGraphBeforeImport()
ResyncSlots(true);
}

public sealed override string name { get { return m_Subgraph != null ? m_Subgraph.name : "Empty Subgraph Block"; } }
public sealed override string name { get { return m_Subgraph != null ? ObjectNames.NicifyVariableName(m_Subgraph.name) : "Empty Subgraph Block"; } }

protected override IEnumerable<VFXPropertyWithValue> inputProperties
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ public override void OnEnable()
shader = ((VFXDataMesh)GetData()).shader;
}

public override VFXCoordinateSpace GetOutputSpaceFromSlot(VFXSlot slot)
{
return VFXCoordinateSpace.Local;
}

public override bool SetupCompilation()
{
shader = ((VFXDataMesh)GetData()).shader;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ public VFXCoordinateSpace space
{
return (m_Data as ISpaceable).space;
}
return VFXCoordinateSpace.Local;
return (VFXCoordinateSpace)int.MaxValue;
}

set
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ private void ClearCopy()
}
}

public sealed override string name { get { return m_Subgraph != null ? m_Subgraph.name : "Empty Subgraph Operator"; } }
public sealed override string name { get { return m_Subgraph != null ? ObjectNames.NicifyVariableName(m_Subgraph.name) : "Empty Subgraph Operator"; } }

protected override IEnumerable<VFXPropertyWithValue> inputProperties
{
Expand Down