Use name in xyz_grid#10524
Merged
Merged
Conversation
Owner
|
why not use name then instead of a hash |
Contributor
Author
|
Had no idea you could use the model name in the override field! Seems to work fine with name, should I change it? |
Owner
|
Yes. |
X/Y/Z grid was still using the old hash, prone to collisions. This changes it to use the name instead. Should fix #10521.
AUTOMATIC1111
approved these changes
May 18, 2023
Collaborator
|
Isn't this commit exactly the same as #10382, why merge repeatedly? |
Contributor
Author
|
Oops, my bad, didn't check the dev branch before submitting the PR. I guess no harm was done though? |
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
3 participants
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.
Describe what this pull request is trying to achieve.
X/Y/Z grid was still using the old hash, prone to collisions. This changes it to use the new
shorthash, and calculates it if not yet known.Should fix #10521.
Additional notes and description of your changes
Had the same issue as poster of issue #10521, where X/Y/Z grid would sometimes load the wrong model. Found out that in my case it was due to the hashes colliding, as X/Y/Z was using the old hash. This changes to use the new shorthash. Also, the shorthash is calculated if it wasn't known before. No extra work is done since it would otherwise be calculated while loading anyway.
Environment this was tested in
Should work on all platforms where loading models by shorthash works.
Tested on: