Skip to content

Commit a71ee1b

Browse files
Disable subblocks space conversion (#2567)
* space fixes in subblocks (no more conversion happens) * Nicify subgraph names * update changelog
1 parent 766ebaf commit a71ee1b

File tree

5 files changed

+9
-3
lines changed

5 files changed

+9
-3
lines changed

com.unity.visualeffectgraph/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ The version number for this package has increased due to a version update of a r
5858
- Fixed Set Strip Progress Attribute utility block in Additional Samples
5959
- Fix [Case 1255182](https://fogbugz.unity3d.com/f/cases/1255182/)
6060
- Remove temporarily "Exact Fixed Time Step" option on VisualEffectAsset to avoid unexpected behavior
61+
- Disable implicit space transformations in sublock graphs as they led to unexpected behaviors
6162

6263
## [10.1.0] - 2020-10-12
6364
### Added

com.unity.visualeffectgraph/Editor/Models/Blocks/VFXSubgraphBlock.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public override void CheckGraphBeforeImport()
4646
ResyncSlots(true);
4747
}
4848

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

5151
protected override IEnumerable<VFXPropertyWithValue> inputProperties
5252
{

com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXStaticMeshOutput.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ public override void OnEnable()
4949
shader = ((VFXDataMesh)GetData()).shader;
5050
}
5151

52+
public override VFXCoordinateSpace GetOutputSpaceFromSlot(VFXSlot slot)
53+
{
54+
return VFXCoordinateSpace.Local;
55+
}
56+
5257
public override bool SetupCompilation()
5358
{
5459
shader = ((VFXDataMesh)GetData()).shader;

com.unity.visualeffectgraph/Editor/Models/Contexts/VFXContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ public VFXCoordinateSpace space
561561
{
562562
return (m_Data as ISpaceable).space;
563563
}
564-
return VFXCoordinateSpace.Local;
564+
return (VFXCoordinateSpace)int.MaxValue;
565565
}
566566

567567
set

com.unity.visualeffectgraph/Editor/Models/Operators/VFXSubgraphOperator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ private void ClearCopy()
132132
}
133133
}
134134

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

137137
protected override IEnumerable<VFXPropertyWithValue> inputProperties
138138
{

0 commit comments

Comments
 (0)