Skip to content

Commit 74c2b91

Browse files
authored
Merge pull request #293 from compas-dev/fix-acm-from-data
When deserializing from data, ctor of ACM fails
2 parents 50f9a0f + 0332ea5 commit 74c2b91

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

CHANGELOG.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Unreleased
2626
* Fixed data type of secs and nsecs in ``Time`` ROS message
2727
* Fixed ``CollisionObject.to_collision_meshes``
2828
* Fixed serialization of joint names for ``compas_fab.robots.JointTrajectoryPoint``
29+
* Fixed deserialization of ``AttachedCollisionMesh``
2930

3031
**Deprecated**
3132

src/compas_fab/robots/planning_scene.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ class AttachedCollisionMesh(object):
170170

171171
def __init__(self, collision_mesh, link_name, touch_links=None, weight=1.):
172172
self.collision_mesh = collision_mesh
173-
self.collision_mesh.root_name = link_name
173+
if self.collision_mesh:
174+
self.collision_mesh.root_name = link_name
174175
self.link_name = link_name
175176
self.touch_links = touch_links if touch_links else [link_name]
176177
self.weight = weight

0 commit comments

Comments
 (0)