Skip to content

Fixed invalid loop length for probe baking (case 1289680) #2830

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

Merged
sebastienlagarde merged 3 commits into from
Dec 15, 2020
Merged

Fixed invalid loop length for probe baking (case 1289680) #2830

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5753a6b
Fixed invalid loop length for probe baking (case 1289680)
fredericv-unity3d Dec 3, 2020
7c3c102
Update CHANGELOG.md
sebastienlagarde Dec 15, 2020
d28a386
Merge branch 'hd/bugfix' into hd/bugfix_case_1289680
sebastienlagarde Dec 15, 2020
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
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
View file
Open in desktop
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
- Fixed probe volumes debug views.
- Fixed NullPointerException when baking probes from the lighting window (case 1289680)

### Changed
- Removed the material pass probe volumes evaluation mode.
Expand Down
4 changes: 3 additions & 1 deletion ...ty.render-pipelines.high-definition/Editor/Lighting/Reflection/HDBakedReflectionSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,20 +322,22 @@ IScriptableBakedReflectionSystemStageNotifier handle
// == 5. ==

// Create new baked state array
var targetSize = m_HDProbeBakedStates.Length + addCount - remCount;
var targetSize = m_HDProbeBakedStates.Length - remCount + toBakeIndicesList.Count;
var targetBakedStates = stackalloc HDProbeBakedState[targetSize];
// Copy baked state that are not removed
var targetI = 0;
for (int i = 0; i < m_HDProbeBakedStates.Length; ++i)
{
if (CoreUnsafeUtils.IndexOf(remIndices, remCount, i) != -1)
continue;
Assert.IsTrue(targetI < targetSize);
targetBakedStates[targetI++] = m_HDProbeBakedStates[i];
}
// Add new baked states
for (int i = 0; i < toBakeIndicesList.Count; ++i)
{
var state = states[toBakeIndicesList.GetUnchecked(i)];
Assert.IsTrue(targetI < targetSize);
targetBakedStates[targetI++] = new HDProbeBakedState
{
instanceID = state.instanceID,
Expand Down