diff --git a/com.unity.shadergraph/CHANGELOG.md b/com.unity.shadergraph/CHANGELOG.md index 79ca08ff163..40129b93e3d 100644 --- a/com.unity.shadergraph/CHANGELOG.md +++ b/com.unity.shadergraph/CHANGELOG.md @@ -93,6 +93,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed a bug where instanced shaders wouldn't compile on PS4. - Optimized loading a large Shader Graph. [1209047](https://issuetracker.unity3d.com/issues/shader-graph-unresponsive-editor-when-using-large-graphs) - Fixed NaN issue in triplanar SG node when blend goes to 0. +- Fixed an issue where Blackboard properties would not duplicate with `Precision` or `Hybrid Instancing` options. +- Fixed an issue where `Texture` properties on the Blackboard would not duplicate with the same `Mode` settings. +- Fixed an issue where `Keywords` on the Blackboard would not duplicate with the same `Default` value. ## [7.1.1] - 2019-09-05 ### Added diff --git a/com.unity.shadergraph/Editor/Data/Graphs/BooleanShaderProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/BooleanShaderProperty.cs index f5721af3fb4..d46c536d96a 100644 --- a/com.unity.shadergraph/Editor/Data/Graphs/BooleanShaderProperty.cs +++ b/com.unity.shadergraph/Editor/Data/Graphs/BooleanShaderProperty.cs @@ -46,7 +46,8 @@ internal override ShaderInput Copy() { displayName = displayName, hidden = hidden, - value = value + value = value, + precision = precision, }; } } diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ColorShaderProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/ColorShaderProperty.cs index 96b678edff1..c237fbc8651 100644 --- a/com.unity.shadergraph/Editor/Data/Graphs/ColorShaderProperty.cs +++ b/com.unity.shadergraph/Editor/Data/Graphs/ColorShaderProperty.cs @@ -63,7 +63,9 @@ internal override ShaderInput Copy() displayName = displayName, hidden = hidden, value = value, - colorMode = colorMode + colorMode = colorMode, + precision = precision, + gpuInstanced = gpuInstanced, }; } } diff --git a/com.unity.shadergraph/Editor/Data/Graphs/CubemapShaderProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/CubemapShaderProperty.cs index 343c76d5001..151a67c669f 100644 --- a/com.unity.shadergraph/Editor/Data/Graphs/CubemapShaderProperty.cs +++ b/com.unity.shadergraph/Editor/Data/Graphs/CubemapShaderProperty.cs @@ -67,7 +67,8 @@ internal override ShaderInput Copy() { displayName = displayName, hidden = hidden, - value = value + value = value, + precision = precision, }; } } diff --git a/com.unity.shadergraph/Editor/Data/Graphs/GradientShaderProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/GradientShaderProperty.cs index 4d2f681f307..4cb5daa5077 100644 --- a/com.unity.shadergraph/Editor/Data/Graphs/GradientShaderProperty.cs +++ b/com.unity.shadergraph/Editor/Data/Graphs/GradientShaderProperty.cs @@ -97,7 +97,8 @@ internal override ShaderInput Copy() { displayName = displayName, hidden = hidden, - value = value + value = value, + precision = precision }; } } diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Matrix2ShaderProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/Matrix2ShaderProperty.cs index 3af6e009024..099d3aef36a 100644 --- a/com.unity.shadergraph/Editor/Data/Graphs/Matrix2ShaderProperty.cs +++ b/com.unity.shadergraph/Editor/Data/Graphs/Matrix2ShaderProperty.cs @@ -45,7 +45,8 @@ internal override ShaderInput Copy() { displayName = displayName, hidden = hidden, - value = value + value = value, + precision = precision, }; } } diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Matrix3ShaderProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/Matrix3ShaderProperty.cs index 610d276b490..f8a801ec08a 100644 --- a/com.unity.shadergraph/Editor/Data/Graphs/Matrix3ShaderProperty.cs +++ b/com.unity.shadergraph/Editor/Data/Graphs/Matrix3ShaderProperty.cs @@ -46,7 +46,8 @@ internal override ShaderInput Copy() { displayName = displayName, hidden = hidden, - value = value + value = value, + precision = precision, }; } } diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Matrix4ShaderProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/Matrix4ShaderProperty.cs index 23302f25d9d..a2f6acf3556 100644 --- a/com.unity.shadergraph/Editor/Data/Graphs/Matrix4ShaderProperty.cs +++ b/com.unity.shadergraph/Editor/Data/Graphs/Matrix4ShaderProperty.cs @@ -43,7 +43,9 @@ internal override ShaderInput Copy() { displayName = displayName, hidden = hidden, - value = value + value = value, + precision = precision, + gpuInstanced = gpuInstanced, }; } } diff --git a/com.unity.shadergraph/Editor/Data/Graphs/SamplerStateShaderProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/SamplerStateShaderProperty.cs index 99d52c0f19f..278c7ff2a47 100644 --- a/com.unity.shadergraph/Editor/Data/Graphs/SamplerStateShaderProperty.cs +++ b/com.unity.shadergraph/Editor/Data/Graphs/SamplerStateShaderProperty.cs @@ -60,7 +60,8 @@ internal override ShaderInput Copy() displayName = displayName, hidden = hidden, overrideReferenceName = overrideReferenceName, - value = value + value = value, + precision = precision, }; } } diff --git a/com.unity.shadergraph/Editor/Data/Graphs/ShaderKeyword.cs b/com.unity.shadergraph/Editor/Data/Graphs/ShaderKeyword.cs index 91d2250a3a3..e6f7e462ab9 100644 --- a/com.unity.shadergraph/Editor/Data/Graphs/ShaderKeyword.cs +++ b/com.unity.shadergraph/Editor/Data/Graphs/ShaderKeyword.cs @@ -196,7 +196,8 @@ internal override ShaderInput Copy() keywordType = keywordType, keywordDefinition = keywordDefinition, keywordScope = keywordScope, - entries = entries + entries = entries, + value = value, }; } } diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayShaderProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayShaderProperty.cs index d9d4f1e6319..1848574bcd3 100644 --- a/com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayShaderProperty.cs +++ b/com.unity.shadergraph/Editor/Data/Graphs/Texture2DArrayShaderProperty.cs @@ -65,7 +65,8 @@ internal override ShaderInput Copy() { displayName = displayName, hidden = hidden, - value = value + value = value, + precision = precision, }; } } diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture2DShaderProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/Texture2DShaderProperty.cs index 92e783d88e8..621a5c2c8a9 100644 --- a/com.unity.shadergraph/Editor/Data/Graphs/Texture2DShaderProperty.cs +++ b/com.unity.shadergraph/Editor/Data/Graphs/Texture2DShaderProperty.cs @@ -78,7 +78,9 @@ internal override ShaderInput Copy() { displayName = displayName, hidden = hidden, - value = value + value = value, + defaultType = defaultType, + precision = precision, }; } } diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Texture3DShaderProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/Texture3DShaderProperty.cs index 18b6b4ba909..044a3eb7cc2 100644 --- a/com.unity.shadergraph/Editor/Data/Graphs/Texture3DShaderProperty.cs +++ b/com.unity.shadergraph/Editor/Data/Graphs/Texture3DShaderProperty.cs @@ -65,7 +65,8 @@ internal override ShaderInput Copy() { displayName = displayName, hidden = hidden, - value = value + value = value, + precision = precision }; } } diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector1ShaderProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/Vector1ShaderProperty.cs index 4cec22b0fa0..03a612cee3b 100644 --- a/com.unity.shadergraph/Editor/Data/Graphs/Vector1ShaderProperty.cs +++ b/com.unity.shadergraph/Editor/Data/Graphs/Vector1ShaderProperty.cs @@ -148,7 +148,9 @@ internal override ShaderInput Copy() rangeValues = rangeValues, enumType = enumType, enumNames = enumNames, - enumValues = enumValues + enumValues = enumValues, + precision = precision, + gpuInstanced = gpuInstanced, }; } } diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector2ShaderProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/Vector2ShaderProperty.cs index 1373a3e2e30..ff5a5b20baa 100644 --- a/com.unity.shadergraph/Editor/Data/Graphs/Vector2ShaderProperty.cs +++ b/com.unity.shadergraph/Editor/Data/Graphs/Vector2ShaderProperty.cs @@ -38,7 +38,9 @@ internal override ShaderInput Copy() { displayName = displayName, hidden = hidden, - value = value + value = value, + precision = precision, + gpuInstanced = gpuInstanced, }; } } diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector3ShaderProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/Vector3ShaderProperty.cs index 68ea8475bf1..02f6f6ca185 100644 --- a/com.unity.shadergraph/Editor/Data/Graphs/Vector3ShaderProperty.cs +++ b/com.unity.shadergraph/Editor/Data/Graphs/Vector3ShaderProperty.cs @@ -39,7 +39,9 @@ internal override ShaderInput Copy() { displayName = displayName, hidden = hidden, - value = value + value = value, + precision = precision, + gpuInstanced = gpuInstanced, }; } } diff --git a/com.unity.shadergraph/Editor/Data/Graphs/Vector4ShaderProperty.cs b/com.unity.shadergraph/Editor/Data/Graphs/Vector4ShaderProperty.cs index ff4d7dc39a5..71634c3f902 100644 --- a/com.unity.shadergraph/Editor/Data/Graphs/Vector4ShaderProperty.cs +++ b/com.unity.shadergraph/Editor/Data/Graphs/Vector4ShaderProperty.cs @@ -41,7 +41,9 @@ internal override ShaderInput Copy() { displayName = displayName, hidden = hidden, - value = value + value = value, + precision = precision, + gpuInstanced = gpuInstanced, }; } }