Fix ClippingPrimitive.ResetRenderer clearing all MaterialPropertyBlock properties#244
Open
Cameron-Micka wants to merge 17 commits intomicrosoft:mainfrom
Open
Conversation
…k properties Removing a renderer from a ClippingPrimitive was calling materialPropertyBlock.Clear() which wiped all properties from the renderer's MaterialPropertyBlock, including those set by other systems (e.g. color via SetPropertyBlock). This caused unrelated material properties to be lost. The Clear() call is unnecessary because ToggleClippingFeature already disables the clipping shader keyword, making any residual clipping properties in the block inert. Fixes microsoft#202 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #202
Removing a renderer from a \ClippingPrimitive\ was calling \materialPropertyBlock.Clear()\ followed by _renderer.SetPropertyBlock(materialPropertyBlock)\ in \ResetRenderer(), which wiped all properties from the renderer's \MaterialPropertyBlock\ — including those set by other systems (e.g. _Color\ via \SetPropertyBlock).
Root Cause
\ClippingPrimitive.ResetRenderer\ unconditionally cleared the entire \MaterialPropertyBlock:
\\csharp
materialPropertyBlock.Clear();
_renderer.SetPropertyBlock(materialPropertyBlock);
\\
This reset not only the clipping-related properties but also any properties set by external code.
Fix
Removed the \Clear()\ + \SetPropertyBlock()\ calls. They are unnecessary because \ToggleClippingFeature(..., false)\ already disables the clipping shader keyword, making any residual clipping properties in the property block inert. This preserves properties set by other systems, matching the MRTK 2.x behavior.