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

Bumps in garden : ign-gui7 #313

Merged
merged 1 commit into from
Nov 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/ci/packages.apt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ libignition-common4-dev
libignition-math6-dev
libignition-msgs8-dev
libignition-plugin-dev
libignition-rendering6-dev
libignition-rendering7-dev
libignition-tools-dev
libignition-transport11-dev
libprotobuf-dev
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})

#--------------------------------------
# Find ignition-rendering
ign_find_package(ignition-rendering6 REQUIRED COMPONENTS ogre)
set(IGN_RENDERING_VER ${ignition-rendering6_VERSION_MAJOR})
ign_find_package(ignition-rendering7 REQUIRED COMPONENTS ogre)
set(IGN_RENDERING_VER ${ignition-rendering7_VERSION_MAJOR})

#--------------------------------------
# Find ignition-msgs
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/minimal_scene/MinimalScene.cc
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ math::Vector3d IgnRenderer::ScreenToScene(
// TODO(ahcorde): Replace this code with function in ign-rendering
// Require this commit
// https:/ignitionrobotics/ign-rendering/pull/363
// in ign-rendering6
// in ign-rendering7

// Normalize point on the image
double width = this->dataPtr->camera->ImageWidth();
Expand Down