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

Fix Alpha Border bugfix #12072

Merged
merged 1 commit into from
Oct 14, 2017
Merged

Conversation

ComancheAk
Copy link
Contributor

This PR fixes Alpha Border fix, which was in this issue by art-kandy:
#12033

Fix Alpha Border in import now works well
2017-10-13 16 07 13

@ghost
Copy link

ghost commented Oct 13, 2017

Please use tabs, clang-format -i filename and git commit --amend

@ghost ghost added this to the 3.0 milestone Oct 13, 2017
@ComancheAk
Copy link
Contributor Author

@Noshyaar I'm sorry, this is my first pull request, so i didn't understand you clearly. What am i supposed to do?

@ghost
Copy link

ghost commented Oct 13, 2017

You can read about code style guideline here.

Also, PR workflow here.

Basically, use tabs for indentation (you're using spaces) and overwrite previous commit using git commit --amend and git push origin fix-alpha-border-bugfix --force.

Feel free to join Godot Discord or IRC Freenode (#godotengine-devel) so that the communication is more instantaneous.

@ComancheAk ComancheAk force-pushed the fix-alpha-border-bugfix branch from ed349b4 to 36f6c88 Compare October 13, 2017 16:23
@ComancheAk
Copy link
Contributor Author

@Noshyaar done

core/image.cpp Outdated
@@ -2473,7 +2473,8 @@ void Image::fix_alpha_edges() {

if (rp[3] < alpha_threshold)
continue;


closest_dist=dist;
Copy link

@ghost ghost Oct 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is still indented with spaces. Please use (five) tabs.

Copy link
Contributor Author

@ComancheAk ComancheAk Oct 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you check it again? In Xcode IDE i have 5 tabs here

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still the same. If it's changed, the comment will fold automatically.

core/image.cpp Outdated
@@ -2473,7 +2473,8 @@ void Image::fix_alpha_edges() {

if (rp[3] < alpha_threshold)
continue;

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line should be blank. No spaces or tabs.

@ComancheAk ComancheAk force-pushed the fix-alpha-border-bugfix branch from 36f6c88 to 82ac8db Compare October 13, 2017 16:27
@ghost
Copy link

ghost commented Oct 13, 2017

Nothing has changed. Please check if you have commited the fixed version.

Edit: changes look okay now. I'll keep this open for reviewers.
Thank you for contributing!

@ComancheAk ComancheAk force-pushed the fix-alpha-border-bugfix branch 2 times, most recently from a96a257 to 7bbae59 Compare October 13, 2017 17:05
@ComancheAk ComancheAk force-pushed the fix-alpha-border-bugfix branch from 7bbae59 to 51597b6 Compare October 13, 2017 17:19
@ComancheAk
Copy link
Contributor Author

@Noshyaar fixed with git add. Thank you!

@groud
Copy link
Member

groud commented Oct 14, 2017

Ok, the changes LGTM and are pretty straightforward. Merging.

@groud groud merged commit e8f8359 into godotengine:master Oct 14, 2017
@Sslaxx
Copy link

Sslaxx commented Oct 14, 2017

Does this also fix #10632?

@ComancheAk ComancheAk deleted the fix-alpha-border-bugfix branch December 9, 2017 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants