-
-
Notifications
You must be signed in to change notification settings - Fork 1k
Fix joining path same pt Id #3532
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
Draft
Annonnymmousss
wants to merge
10
commits into
GraphiteEditor:master
Choose a base branch
from
Annonnymmousss:fix-joining_path-same_ptId
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
c2730bd
Promote vector meshes from experimental by removing it from preferences
Keavon c7ec00a
Merge branch 'GraphiteEditor:master' into master
Annonnymmousss 783c185
Merge branch 'GraphiteEditor:master' into master
Annonnymmousss befe6a8
Merge branch 'GraphiteEditor:master' into master
Annonnymmousss 3f9112c
Merge branch 'GraphiteEditor:master' into master
Annonnymmousss 76f5132
Merge branch 'GraphiteEditor:master' into master
Annonnymmousss dcad09b
Merge branch 'GraphiteEditor:master' into master
Annonnymmousss d34d3b8
Merge branch 'GraphiteEditor:master' into master
Annonnymmousss bcc1749
Merge branch 'GraphiteEditor:master' into master
Annonnymmousss 201842a
fix : sync data section and editor
Annonnymmousss File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Oops, something went wrong.
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 was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only ids in
layer2will change (since thelayer1will probably have no conflicts).Furthermore it is possible that there is no conflict, in which case the original
PointIdmust be used (like before this PR). You therefore need to check if there was some conflict by checking all of the point ids in the first path.I don't care if this doesn't work for tables with several vector data, since I find them annoying.