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

Internal/master #8015

Merged
merged 33 commits into from
Jan 2, 2024
Merged

Internal/master #8015

Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7b122b1
[UIT-2237]: Reverting the new Contextual Menu feature.
freddy-cheungh Dec 12, 2023
13ba7b6
2d/staging/tilemap/uum53666
ChuanXin-Unity Dec 12, 2023
52d453d
[HDRP] Various fixes
adrien-de-tocqueville Dec 12, 2023
6094ffc
Render Graph compilation caching.
JulienIgnace-Unity Dec 12, 2023
158e6c5
[VFX/SG] Fix Custom HLSL
PaulDemeulenaere Dec 12, 2023
3872cf5
Graphics/SRP/RPF - RG Opt 1 - Using UnityEngine.Pool for RenderGraphO…
axoloto Dec 12, 2023
3c6b8bf
[Bug UUM-58488] Fix typos, misspellings, & inaccuracies in Node Refer…
bencloward Dec 12, 2023
766c1dc
Graphics/hd/fix/56870 Sky occlusion: tooltips and documentation updat…
arthur-dufay Dec 13, 2023
9e53df8
[URP]Implementing uUniversalRenderPipelinePostProcessDataUsage Analytic.
alex-vazquez-unity3d Dec 13, 2023
3b9d2d9
[2023.3][URP] Fixing decals not affecting grass when using Deferred R…
ellioman Dec 13, 2023
187c3d9
Fix UUM-58354 by splitting up large probe jobs
pigselated Dec 13, 2023
0cdb567
[URP][2023.3] Fixing an issue where SSAO feature can not be disabled …
ellioman Dec 13, 2023
3215702
[HDRP][Docs] Fix Water burst script having compilation issues
remi-chapelain Dec 13, 2023
1de0c11
[HDRP] Correct rayrtacing limitation documentation
sebastienlagarde Dec 13, 2023
4fcaf12
[2023.3][URP] Make ValidateRendererFeatures() use IsSubclassOf instea…
ellioman Dec 13, 2023
88f4e29
Fix rendering debugger null exception on render graph path.
eh-unity Dec 13, 2023
a61a8db
Fix Some Warnings in 32-bit STP Path
gmitrano-unity Dec 13, 2023
ee880a6
[SRP] Add XR for Data Driven Lens Flare
Dec 15, 2023
43866ac
[Graphics][URP][Bugfix][Trunk] Foward+ Reflection Probe GL y-flip fix
Nzollner Dec 15, 2023
2c6583d
[VFX] Particle strips missing functionality
gabrieldelacruz Dec 15, 2023
e791836
[VFX] Fix Sample Camera Buffer in Dispatch
PaulDemeulenaere Dec 15, 2023
d607c2d
Add Profiling Markers for RecordRenderGraph
RoseHirigoyen Dec 15, 2023
94cd81f
Remove one of duplicate dependencies from RP Core to com.unity.collec…
arttu-peltonen Dec 15, 2023
cf0d2a8
Added HDRP stencil documentation page
alelievr Dec 15, 2023
6a5a847
[POI-817] Optimize RenderGraph CPU cost by converting Bloom from many…
eh-unity Dec 16, 2023
9c302f1
[HDRP] Fix raytraced shadow denoising on box lights
pjbunity Dec 16, 2023
4861fd7
Documentation/staging
RobJessop Dec 16, 2023
a53e0ee
Graphics/SRP/RPF - RG Opt 2 - No more buffers clearing in RenderGraph…
axoloto Dec 19, 2023
5577d27
[URP] Fix SSAO + DBuffer global texture
mcc-unity Dec 19, 2023
7ff3ddc
Fixed a null ref exception when baking APV without GPU streaming enab…
JulienIgnace-Unity Dec 19, 2023
646c007
[HDRP] Update What's new 17 documentation page
sebastienlagarde Dec 20, 2023
229c766
Graphics/SRP/RPF - RG Opt 3 - Disable Render Graph Validation Checks …
axoloto Dec 20, 2023
b883dcf
[VFX] Fixed two unexpected console messages
julienamsellem Dec 20, 2023
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
Remove one of duplicate dependencies from RP Core to com.unity.collec… 
…tions

I noticed an error in RP Core package definition, it has a duplicate dependency to `com.unity.collections` pacakage with two different versions. For some reason this didn't raise any errors anywhere.

It is fixed by removing the reference to the older version, since we upgraded from 1.4.0 to 2.2.0 earlier this year. Some kind of merge conflict when merging latest trunk on [the upgrade PR](https://github.cds.internal.unity3d.com/unity/unity/pull/35168/) caused this, and nobody noticed.
  • Loading branch information
@arttu-peltonen
arttu-peltonen authored and Evergreen committed Dec 15, 2023
commit 94cd81f44d051e128e77896f8f25e3a533a952df
1 change: 0 additions & 1 deletion Packages/com.unity.render-pipelines.core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"unity": "2023.3",
"displayName": "Core RP Library",
"dependencies": {
"com.unity.collections": "1.4.0",
"com.unity.mathematics": "1.2.6",
"com.unity.ugui": "2.0.0",
"com.unity.collections": "2.2.0",
Expand Down