Skip to content

Commit 5f6fd15

Browse files
Merge master into fix/remove-mono-api
- Resolved CHANGELOG.md conflict by keeping both [Unreleased] section with CoreCLR API fix and new [3.5.1] version
2 parents 40bcae9 + 4d0623f commit 5f6fd15

File tree

2,190 files changed

+27039
-38571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,190 files changed

+27039
-38571
lines changed

.yamato/_abv.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@ graphics_repo_nightly_trunk:
99
- branch: master
1010
frequency: weekly
1111
dependencies:
12-
- path: .yamato/_templates.yml#all_template_ci_trunk
13-
rerun: always
1412
- path: .yamato/all-postprocessing.yml#PostProcessing_trunk
1513
rerun: always

.yamato/_templates.yml

Lines changed: 0 additions & 327 deletions
This file was deleted.

Packages/com.unity.render-pipelines.core/Editor-PrivateShared/AssemblyInfo.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
using System.Runtime.CompilerServices;
22

3+
// HDRP
34
[assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Editor")]
5+
[assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Editor.Tests")]
6+
7+
// URP
48
[assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Editor")]
59
[assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Editor.Tests")]
610

Packages/com.unity.render-pipelines.core/Editor-PrivateShared/AssetCallbacks/AssetCreationUtil.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ static void CreateAsset(string name, Action<string> callback = null, string exte
9292
assetCreationCallback.extension = extension;
9393

9494
var icon = AssetPreview.GetMiniTypeThumbnail(type);
95-
ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, assetCreationCallback, name, icon, null, false);
95+
ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, assetCreationCallback, name, icon, null, false);
9696
}
9797

9898
class AssetCreationCallback : ProjectWindowCallback.AssetCreationEndAction

Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/AssetsConverter.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ void OnSearchFinish()
3030
contextSearchQueriesAndIds,
3131
(item, description) =>
3232
{
33-
var assetItem = new RenderPipelineConverterAssetItem(item.id);
33+
var assetItem = new RenderPipelineConverterAssetItem(item.id)
34+
{
35+
info = description
36+
};
3437
assets.Add(assetItem);
3538
},
3639
OnSearchFinish

Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/ReadonlyMaterialConverter.meta renamed to Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/ReadonlyMaterialConverter.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/com.unity.render-pipelines.universal/Editor/Tools/Converters/ReadonlyMaterialConverter/ReadonlyMaterialConverter.MaterialReferenceBuilder.cs renamed to Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/ReadonlyMaterialConverter/ReadonlyMaterialConverter.MaterialReferenceBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System;
44
using UnityEngine;
55

6-
namespace UnityEditor.Rendering.Universal
6+
namespace UnityEditor.Rendering.Converter
77
{
88
internal class MaterialReferenceBuilder : IDisposable
99
{

Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/ReadonlyMaterialConverter/ReadonlyMaterialConverter.MaterialReferenceBuilder.cs.meta

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)