Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Sg/inline color node hdr to default fix #91

Merged
merged 25 commits into from
May 6, 2020
Merged

Sg/inline color node hdr to default fix #91

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
cd4b320
fix for https://fogbugz.unity3d.com/f/cases/1184248/
zadi0648 Jan 17, 2020
fa5f6af
fix for https://fogbugz.unity3d.com/f/cases/1185260/
zadi0648 Jan 22, 2020
0d64c6f
removed unnecessary float4 + ColorNode parity
zadi0648 Feb 13, 2020
ec992f1
Merge branch 'master' into sg/color-property-to-match-inline
zadi0648 Mar 5, 2020
95cbc86
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
zadi0648 Mar 6, 2020
890bb7d
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
zadi0648 Mar 9, 2020
795d4ea
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
zadi0648 Mar 13, 2020
bb13c92
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
zadi0648 Mar 16, 2020
7fbdf82
fix to shader graph files (needed a save)
zadi0648 Mar 17, 2020
d5f2e4b
fixing hdrp shader graphs
zadi0648 Mar 17, 2020
5c8fde1
file cleanup
zadi0648 Mar 17, 2020
9f239fa
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
zadi0648 Mar 17, 2020
93c8a44
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
zadi0648 Mar 17, 2020
baaa030
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
zadi0648 Mar 23, 2020
92521ee
kept the clamping
zadi0648 Mar 23, 2020
9367f80
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
zadi0648 Mar 23, 2020
7f0154c
modification scope fix
zadi0648 Mar 23, 2020
109d278
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
zadi0648 Mar 25, 2020
d35d501
fixed changelog error
zadi0648 Mar 25, 2020
053e176
fixed changelog error
zadi0648 Mar 25, 2020
856bf9f
Merge branch 'master' into sg/inline-color-node-hdr-to-default-fix
zadi0648 Apr 1, 2020
74e4ebb
Merge branch 'master' into sg/inline-color-node-hdr-to-default-fix
marctem Apr 9, 2020
108ac3b
Merge remote-tracking branch 'origin/master' into sg/inline-color-nod…
marctem Apr 24, 2020
6e77485
Merge remote-tracking branch 'origin/master' into sg/inline-color-nod…
marctem May 5, 2020
7801df8
Merge branch 'master' into sg/inline-color-node-hdr-to-default-fix
marctem May 5, 2020
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
Prev Previous commit
Next Next commit
Merge branch 'master' of https://github.com/Unity-Technologies/Script… 
…ableRenderPipeline into sg/color-property-to-match-inline
  • Loading branch information
@zadi0648
zadi0648 committed Mar 23, 2020
commit baaa0303d2b3b7402b39f28a4df7e62d85ce3384
3 changes: 1 addition & 2 deletions com.unity.shadergraph/Editor/Data/Nodes/Input/PropertyNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public override string GetVariableNameForSlot(int slotId)
return property.referenceName;
}

protected override bool CalculateNodeHasError(ref string errorMessage)
protected override void CalculateNodeHasError()
{
if (!propertyGuid.Equals(Guid.Empty) && !owner.properties.Any(x => x.guid == propertyGuid))
{
Expand All @@ -202,7 +202,6 @@ public override void EvaluateConcretePrecision()
concretePrecision = precision.ToConcrete();
else
concretePrecision = owner.concretePrecision;
return false;
}

public override void OnBeforeSerialize()
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.