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

matdbg: Fix material collision #8322

Merged
merged 2 commits into from
Dec 19, 2024
Merged

matdbg: Fix material collision #8322

merged 2 commits into from
Dec 19, 2024

Conversation

poweifeng
Copy link
Contributor

Fix 3 bugs wrt matdbg:

  1. The numbering scheme for materials with same name was buggy
  2. The shared depth variants of the default material should also show up as active material variants.
  3. When two instantiation of FMaterial point to the exact same bits, we still need to treat them as two materials. (Otherwise we wouldn't be able to modify one of them in matdbg).

@poweifeng poweifeng added the internal Issue/PR does not affect clients label Dec 18, 2024
libs/matdbg/src/DebugServer.cpp Outdated Show resolved Hide resolved
Fix 3 bugs wrt matdbg:

1. The numbering scheme for materials with same name was buggy
2. The shared depth variants of the default material should also
   show up as active material variants.
3. When two instantiation of FMaterial point to the exact same
   bits, we still need to treat them as two materials. (Otherwise
   we wouldn't be able to modify one of them in matdbg).
@poweifeng poweifeng force-pushed the pf/matdbg-fix-collision branch from cfecaff to d92a229 Compare December 19, 2024 19:58
@poweifeng poweifeng enabled auto-merge (squash) December 19, 2024 20:00
@poweifeng poweifeng merged commit aa09d86 into main Dec 19, 2024
12 checks passed
@poweifeng poweifeng deleted the pf/matdbg-fix-collision branch December 19, 2024 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
internal Issue/PR does not affect clients
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants