Skip to content

Commit 7440f59

Browse files
AndrewSaraevUnitypastasfuture
authored andcommitted
Enforce SRP Batcher and Hybrid renderer compatibility by always using a consolidated property list (#3577) (#2)
* Make all passes in a subshader use the same HLSL proeprty declarations * Adding changelog * Better fix for Targets accessing the current blocks (cherry picked from commit 26a1096)
1 parent 7feefa3 commit 7440f59

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

com.unity.shadergraph/CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ All notable changes to this package are documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7-
## [10.6.0] - 2021-04-29
7+
## [10.5.0] - 2020-03-15
8+
### Fixed
9+
- Fixed an issue where the exposed checkbox was removed from keyword inspectors [1312779] (https://issuetracker.unity3d.com/issues/shader-graph-exposed-parameter-for-keywords-removed-by-accident)
10+
- Fixed issue with SRP Batcher compatibility [1310624]
11+
- Fixed issue with Hybrid renderer compatibility [1296776]
12+
813
## [10.3.1/custom]
914
Version Updated
1015
### Fixed

com.unity.shadergraph/Editor/Generation/Processors/Generator.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ void BuildShader()
160160
m_Targets[i].Setup(ref context);
161161

162162
var subShaderProperties = GetSubShaderPropertiesForTarget(m_Targets[i], m_GraphData, m_Mode, m_OutputNode, m_TemporaryBlocks);
163+
163164
foreach (var subShader in context.subShaders)
164165
{
165166
GenerateSubShader(i, subShader, subShaderProperties);

0 commit comments

Comments
 (0)