This repository was archived by the owner on Mar 30, 2019. It is now read-only.
Added ColorConverter & Color4Converter#2
Closed
jbriguet wants to merge 3 commits intosharpdx:masterfrom
Closed
Conversation
Collaborator
|
I have integrated your changes, but without using your pull request. It looks like you are not correctly using git as you are creating a merge while you should only make a rebase. When you rebase you work from SharpDX, you need to do a rebase (pull rebase) and not a merge. Merge needs to be avoided as much as possible because they generate complex graph when there is no need for them. |
Collaborator
|
In order to work properly, you can reset your local repository on a revision prior your changes and rebase from latest SharpDX. |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 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.
Hi,
In order to use the Color and Color4 structs in PropertyGrid, I added the matching ColorConverter and Color4Converter, which are basically copies of the one that were made for Vector4.
Voila :)