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.

Sign up for GitHub

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

Jump to bottom

[all] Fix rgbacolor parsing #305

Merged
merged 6 commits into from
Jun 28, 2017
Merged

[all] Fix rgbacolor parsing #305

merged 6 commits into from
Jun 28, 2017

Conversation

damienmarchal
Copy link
Contributor

@damienmarchal damienmarchal commented Jun 15, 2017 •
edited
Loading

There was a regression in the way RGBAColor are parsed by the stream operator>>.
This was the cause of Material reading was not working (issue #302).

This PR fix:

  • fix the problem.
  • add new tests for RGBAColor & Material
  • Clean Material without breaking the API.

This PR:

  • builds with SUCCESS for all platforms on the CI.
  • does not generate new warnings.
  • does not generate new unit test failures.
  • does not generate new scene test failures.
  • does not break API compatibility.
  • is more than 1 week old (or has fast-merge label).

Reviewers will merge only if all these checks are true.

@damienmarchal
[SofaKernel] Small refactoring of Material.
d9537b0 
- Move it from core/loader to helper/types
- Add backward compatibility to the preserve the existing API.
- Add tests to this class.
- Move the code into a .cpp instead of the .h
@damienmarchal
[SofaKernel] Forgot to update the CMakeList
7fd2872
@damienmarchal
[SofaKernel] Fix the parsing problem on the >> operator + add more te…
b010ae3 
…sts.
@damienmarchal damienmarchal reopened this Jun 15, 2017
@damienmarchal damienmarchal added pr: fast merge Minor change that can be merged without waiting for the 7 review days pr: fix Fix a bug pr: status to review To notify reviewers to review this pull-request labels Jun 15, 2017
@damienmarchal damienmarchal added this to the v17.06 milestone Jun 16, 2017
@guparan
Copy link
Contributor

guparan commented Jun 20, 2017

Thanks for your PR @damienmarchal
LGTM. Could someone else have a quick look ?

@damienmarchal
Copy link
Contributor Author

No-one answered so it means you can merge it :)

@damienmarchal damienmarchal changed the title Fix rgbacolor parsing [all] Fix rgbacolor parsing Jun 26, 2017
@damienmarchal damienmarchal mentioned this pull request Jun 26, 2017
Closed
@guparan guparan merged commit 5c79678 into sofa-framework:master Jun 28, 2017
guparan added a commit that referenced this pull request Jun 28, 2017
@guparan
Merge pull request #305 from SofaDefrost/fix_rgbacolor_parsing
1ae96b7 
[all] Fix rgbacolor parsing
@damienmarchal damienmarchal deleted the fix_rgbacolor_parsing branch July 5, 2017 21:19
@hugtalbot hugtalbot added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels May 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@guparan guparan

Labels
pr: fast merge Minor change that can be merged without waiting for the 7 review days pr: fix Fix a bug pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Milestone
v17.06
Development

Successfully merging this pull request may close these issues.
3 participants
@damienmarchal @guparan @hugtalbot