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

[SofaKernel] several small fix #953

Merged
merged 9 commits into from Mar 19, 2019

Conversation

2 participants
@epernod
Copy link
Contributor

commented Mar 4, 2019

Several changes and fix from my master branch:

  • Fix: Duplicate declaration of Data in MechanicalObject
  • Fix: the graph display of topologyData.
  • Replace serr by msg_error and put some methods and parameter from private to protected in SofaMeshCollision classes
  • Add: missing generic methods in MeshTopology

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.

@epernod

This comment has been minimized.

Copy link
Contributor Author

commented Mar 5, 2019

[ci-build][with-all-tests]

Show resolved Hide resolved SofaKernel/modules/SofaBaseTopology/MeshTopology.cpp Outdated
Show resolved Hide resolved SofaKernel/modules/SofaMeshCollision/PointLocalMinDistanceFilter.cpp Outdated
Show resolved Hide resolved SofaKernel/modules/SofaMeshCollision/TriangleLocalMinDistanceFilter.cpp Outdated
@@ -96,19 +96,11 @@ class MechanicalObject : public sofa::core::behavior::MechanicalState<DataTypes>
public:
virtual void parse ( core::objectmodel::BaseObjectDescription* arg ) override;

#ifdef SOFA_HAVE_NEW_TOPOLOGYCHANGES
#ifdef SOFA_HAVE_NEW_TOPOLOGYCHANGES

This comment has been minimized.

Copy link
@guparan

guparan Mar 5, 2019

Member

Looks like you slipped on the space bar here 😉

This comment has been minimized.

Copy link
@epernod

epernod Mar 11, 2019

Author Contributor

is there an easy way to remove that without doing a commit only for that?

This comment has been minimized.

Copy link
@guparan

guparan Mar 11, 2019

Member

Unfortunately no.

epernod added some commits Mar 8, 2019

@guparan guparan merged commit 63cb643 into sofa-framework:master Mar 19, 2019

7 checks passed

Dashboard Builds triggered.
Details
[with-regression-tests] Triggered in latest build.
Details
[with-scene-tests] Triggered in latest build.
Details
centos_clang-5_options Build OK. FIXME: 1 unit tests, 0 scene tests 8 regressions
Details
mac_clang-3.5_options Build OK.
Details
ubuntu_gcc-5.4_options Build OK. FIXME: 1 unit tests, 0 scene tests 7 regressions
Details
windows7_VS-2015_options_amd64 Build OK. FIXME: 2 unit tests, 0 scene tests 7 regressions
Details

@guparan guparan added this to the v19.06 milestone Jun 20, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.