Fix history mismatch #78827
Merged
Fix history mismatch #78827
Conversation
This file contains 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
akien-mga
added
the
cherrypick:4.1
Rindbee
force-pushed
the
fix-history-mismatch
branch
from
da59bd5
to
77a8aff
Compare
Rindbee
commented
Jul 7, 2023
groud
reviewed
Jul 10, 2023
Rindbee
force-pushed
the
fix-history-mismatch
branch
from
77a8aff
to
7bc3852
Compare
Set the properties of the resource's proxy instead of setting the resource's properties directly. (For action "Set ...") Update the path of the edited scene when saving the scene. (For action "Add atlas source")
Rindbee
force-pushed
the
fix-history-mismatch
branch
from
7bc3852
to
28db5e7
Compare
KoBeWi
approved these changes
Jul 25, 2023
|
Thanks! |
YuriSizov
removed
the
cherrypick:4.1
|
Cherry-picked for 4.1.2. |
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.
There are two cases for the error message, see #73603 (comment).
Set the properties of the resource's proxy instead of setting the resource's properties directly. (For action "Set ...")
Update the path of the edited scene when saving the scene. (For action "Add atlas source", see #73603 (comment))
Before
0.mp4
After
1.mp4
Fix #73603, fix #74594.