Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

fd2d3f28

Commit fd2d3f28 authored 3 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'add-is-static-to-scene-object' into 'master'

Add is static to scene object

See merge request ArmarX/RobotAPI!219

parents 6cd27de0 145361d7

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ObjectPoseClientExample/ObjectPoseClientExample.cpp 3 additions, 1 deletion

...nents/ObjectPoseClientExample/ObjectPoseClientExample.cpp
source/RobotAPI/libraries/ArmarXObjects/Scene.h 1 addition, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/Scene.h
source/RobotAPI/libraries/ArmarXObjects/json_conversions.cpp 22 additions, 2 deletions

source/RobotAPI/libraries/ArmarXObjects/json_conversions.cpp
source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp 2 additions, 1 deletion

...otAPI/libraries/armem_objects/server/instance/Segment.cpp

with 28 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment