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

Merge sdf12 -> main #813

Merged
merged 24 commits into from
Jan 3, 2022
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
2349364
add enable_orientation to 1.6 spec (#686)
iche033 Nov 8, 2021
0c6e7ad
Backport cmake/test fixes to sdf6 (#761)
scpeters Nov 29, 2021
9ba8ea1
Merge branch 'sdf6' into sdf9
scpeters Dec 6, 2021
3266e33
Merge pull request #774 from scpeters/merge_6_9
scpeters Dec 6, 2021
24a2782
Documentation: Clarify behavior of //model/model/static (#713)
FirefoxMetzger Dec 10, 2021
41ad073
Fix loading nested include with custom attributes (#789)
jennuine Dec 17, 2021
e5c29da
9 ➡️ 10
chapulina Dec 21, 2021
6b53f95
9 ➡️ 10 (#795)
chapulina Dec 21, 2021
92d20d2
Replace custom cmake code with ign-cmake2 (#780)
scpeters Dec 22, 2021
1a2c406
Prepare for 10.7.0~pre1 (#799)
scpeters Dec 23, 2021
cf81994
Fix test compilation with USE_INTERNAL_URDF (#800)
scpeters Dec 27, 2021
1741bb0
Prepare for 10.7.0~pre2 (#802)
scpeters Dec 27, 2021
5f326e9
Prepare for 10.7.0, final Dome release (#804)
scpeters Dec 27, 2021
38a69ab
Merge commit '6b53f954b8b74d0bdba33982d59c25da8b280ee4' into merge_9_…
scpeters Dec 29, 2021
bff502f
sdf_custom: fix nested model expectations (#807)
scpeters Dec 29, 2021
5c6e870
Merge pull request #807 from scpeters/merge_9_to_11
scpeters Dec 29, 2021
09c06ea
Merge branch 'sdf10' into merge_10_11
scpeters Dec 29, 2021
f03ec70
Fix compiler warnings (#808)
scpeters Dec 29, 2021
206e698
Merge pull request #808 from scpeters/merge_10_11
scpeters Dec 30, 2021
08eccbf
Merge branch 'sdf11' into merge_11_to_12
scpeters Dec 30, 2021
15e6793
Fix compiler warnings (#810)
scpeters Dec 30, 2021
8785b7a
Merge pull request #810 from scpeters/merge_11_to_12
scpeters Dec 30, 2021
6404afd
Fix parsing 'type' attibutes in plugins (#809)
chapulina Jan 3, 2022
fc5d1f2
Merge branch 'sdf12' into merge_12_main
scpeters Jan 3, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix compiler warnings (#808)
Signed-off-by: Steve Peters <[email protected]>
  • Loading branch information
scpeters committed Dec 30, 2021
commit f03ec70fecd1426f1562bc2d20e0a87435ce4bef
2 changes: 0 additions & 2 deletions src/FrameSemantics.cc
Original file line number Diff line number Diff line change
@@ -313,7 +313,6 @@ Errors buildFrameAttachedToGraph(

const std::string scopeContextName = "__model__";

auto rootId = ignition::math::graph::kNullId;
if (_isRoot)
{
// The __root__ vertex identifies the scope that contains a root level
@@ -326,7 +325,6 @@ Errors buildFrameAttachedToGraph(
// more complexity to the validateFrameAttachedToGraph code.
_out = _out.AddScopeVertex(
"", "__root__", scopeContextName, sdf::FrameType::STATIC_MODEL);
rootId = _out.ScopeVertexId();
}

const auto modelId = _out.AddVertex(_model->Name(), frameType).Id();
2 changes: 1 addition & 1 deletion src/World.cc
Original file line number Diff line number Diff line change
@@ -216,7 +216,7 @@ Errors World::Load(sdf::ElementPtr _sdf, const ParserConfig &_config)

for (const auto &ifaceModelPair : this->dataPtr->interfaceModels)
{
frameNames.insert(ifaceModelPair.second->Name()).second;
frameNames.insert(ifaceModelPair.second->Name());
}

// Load all the physics.