Skip to content

Commit e82b08b

Browse files
svc-reach-platform-supportEvergreen
authored andcommitted
[Port] [6000.3] [SG] Fixes for Node Preview Preferences issues
1 parent 45c9a97 commit e82b08b

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

Packages/com.unity.shadergraph/Editor/Data/Graphs/GraphData.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ public void ClearChanges()
698698
m_MovedContexts = false;
699699
}
700700

701-
public void AddNode(AbstractMaterialNode node)
701+
public void AddNode(AbstractMaterialNode node, bool usePreviewPref = true)
702702
{
703703
if (node is AbstractMaterialNode materialNode)
704704
{
@@ -708,7 +708,8 @@ public void AddNode(AbstractMaterialNode node)
708708
return;
709709
}
710710

711-
materialNode.previewExpanded = ShaderGraphPreferences.newNodesPreview;
711+
if (usePreviewPref && materialNode.UsePreviewPref)
712+
materialNode.previewExpanded = ShaderGraphPreferences.newNodesPreview;
712713

713714
AddNodeNoValidate(materialNode);
714715

@@ -2301,7 +2302,7 @@ internal void PasteGraph(CopyPasteGraph graphToPaste, List<AbstractMaterialNode>
23012302
}
23022303

23032304
remappedNodes.Add(pastedNode);
2304-
AddNode(pastedNode);
2305+
AddNode(pastedNode, false);
23052306

23062307
// add the node to the pasted node list
23072308
m_PastedNodes.Add(pastedNode);

Packages/com.unity.shadergraph/Editor/Data/Nodes/AbstractMaterialNode.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ abstract class AbstractMaterialNode : JsonObject, IGroupItem, IRectInterface
4343

4444
internal virtual bool ExposeToSearcher => true;
4545

46+
internal virtual bool UsePreviewPref => true;
47+
4648
protected virtual bool CanPropagateFloatLiteral => false;
4749

4850
OnNodeModified m_OnModified;

Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/PreviewNode.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ class PreviewNode : CodeFunctionNode
88
{
99
public override bool hasPreview { get { return true; } }
1010

11+
internal override bool UsePreviewPref => false;
12+
1113
protected override bool CanPropagateFloatLiteral => true;
1214

1315
[SerializeField]

0 commit comments

Comments
 (0)