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.

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

Fixed side effect on styles during compositor rendering. #3081

Merged
merged 19 commits into from
Jan 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
77bae01
Fixed Render Graph immediate mode. (#3033)
JulienIgnace-Unity Jan 8, 2021
47bd6c2
Fix issue with shadow mask and area lights (#3019)
FrancescoC-unity Jan 8, 2021
88daab3
Fix issue with capture callback (now includes post processing results…
pmavridis Jan 8, 2021
4313b48
[HDRP] Fix decal draw order for ShaderGraph decal materials (#3018)
alelievr Jan 8, 2021
a9c4c27
Fixed various Look Dev issues after exiting Playmode (#2956)
JulienIgnace-Unity Jan 11, 2021
d358740
Merge branch 'master' into hd/bugfix
sebastienlagarde Jan 11, 2021
11b5984
Merge branch 'master' into hd/bugfix
sebastienlagarde Jan 11, 2021
a22cfa4
StackLit: Fix SG surface option property block to only display energy…
slunity Jan 12, 2021
a3c36a5
Fixed missing BeginCameraRendering call for custom render mode of a C…
sebastienlagarde Jan 12, 2021
6cb6820
Implement custom drawer for layer mask parameters (#3066)
adrien-de-tocqueville Jan 12, 2021
ccf4f96
Adding mixed light baking shadowmask test (#3052)
remi-chapelain Jan 12, 2021
6149540
Changed the clamping approach for RTR and RTGI (in both perf and qual…
anisunity Jan 12, 2021
cf36177
Fixed the condition on temporal accumulation in the reflection denois…
anisunity Jan 12, 2021
5fecd49
Changed the warning message for ray traced area shadows (case 1303410…
anisunity Jan 12, 2021
ea359d1
Fixed side effect on styles during compositor rendering.
adrien-de-tocqueville Jan 12, 2021
a65fa59
Merge branch 'hd/bugfix' into hd/fix-compositor-style
sebastienlagarde Jan 14, 2021
a6d6821
Update CHANGELOG.md
sebastienlagarde Jan 14, 2021
0bfc494
fix merge issue
sebastienlagarde Jan 14, 2021
5476dbd
Merge branch 'hd/bugfix' into hd/fix-compositor-style
sebastienlagarde Jan 14, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed an issue with light intensity prefab override application not visible in the inspector (case 1299563).
- Fixed Undo/Redo instability of light temperature.
- Fixed label style in pbr sky editor.
- Fixed side effect on styles during compositor rendering.

### Changed
- Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ static internal class CompositorStyle


internal static readonly int k_IconSize = 28;
internal static readonly int k_HeaderFontSize = 14;
internal static readonly int k_ListItemPading = 4;
internal static readonly int k_ListItemStackPading = 20;
internal static readonly float k_SingleLineHeight = EditorGUIUtility.singleLineHeight;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ static partial class Styles
static public readonly string k_AlphaWarningPipeline = "The rendering pipeline was not configured to output an alpha channel. You can select a color buffer format that supports alpha in the HDRP quality settings.";
static public readonly string k_AlphaWarningPost = "The post processing system was not configured to process the alpha channel. You can select a buffer format that supports alpha in the HDRP quality settings.";
static public readonly string k_ShaderWarning = "You must specify a composition graph to see an output from the compositor.";

static public readonly GUIStyle k_HeaderStyle = new GUIStyle(EditorStyles.helpBox) { fontSize = CompositorStyle.k_HeaderFontSize };
}

ReorderableList m_layerList;
Expand Down Expand Up @@ -121,9 +123,6 @@ public override void OnInspectorGUI()
return;
}

var headerStyle = EditorStyles.helpBox;
headerStyle.fontSize = 14;

// Cache the serialized property fields
if (m_IsEditorDirty || m_SerializedProperties == null)
{
Expand Down Expand Up @@ -273,7 +272,7 @@ public override void OnInspectorGUI()

EditorGUI.BeginChangeCheck();
EditorGUILayout.BeginVertical();
EditorGUILayout.LabelField(Styles.k_RenderSchedule, headerStyle);
EditorGUILayout.LabelField(Styles.k_RenderSchedule, Styles.k_HeaderStyle);
m_layerList.DoLayoutList();
EditorGUILayout.EndVertical();
if (EditorGUI.EndChangeCheck())
Expand All @@ -292,7 +291,7 @@ public override void OnInspectorGUI()
EditorGUI.BeginChangeCheck();
if (m_layerList.index >= 0)
{
EditorGUILayout.LabelField(Styles.k_Properties, headerStyle);
EditorGUILayout.LabelField(Styles.k_Properties, Styles.k_HeaderStyle);

rectangle.y += EditorGUIUtility.singleLineHeight * 1.5f;
rectangle.x += 5;
Expand Down