fixes

Author: Licini

src/compas/scene/scene.py

@@ -78,17 +78,17 @@ def node_repr(node):
 
     @property
     def items(self):
-        # type: () -> list
+        # type: () -> list[compas.data.Data]
         return list(self.datastore.values())
 
     @property
     def objects(self):
-        # type: () -> list
+        # type: () -> list[SceneObject]
         return list(self.objectstore.values())
 
     @property
     def context_objects(self):
-        # type: () -> list
+        # type: () -> list[SceneObject]
         guids = []
         for obj in self.objects:
             guids += obj.guids
@@ -113,6 +113,11 @@ def add(self, item, parent=None, **kwargs):
             The scene object associated with the item.
         """
 
+        if "context" in kwargs:
+            if kwargs["context"] != self.context:
+                raise Exception("Object context should be the same as scene context: {} != {}".format(kwargs["context"], self.context))
+            del kwargs["context"]  # otherwist the SceneObject receives "context" twice, which results in an error
+
         # Create a corresponding new scene object
         sceneobject = SceneObjectFactory.create(item=item, context=self.context, scene=self, **kwargs)
 

src/compas/scene/sceneobject.py

@@ -286,12 +286,12 @@ def contrastcolor(self, color):
         self._contrastcolor = Color.coerce(color)
 
     def add(self, item, **kwargs):
-        """Add a scene object to the scene.
+        """Add a child item to the scene object.
 
         Parameters
         ----------
         item : :class:`compas.data.Data`
-            The item to add to the scene.
+            The item to add.
         **kwargs : dict
             Additional keyword arguments to pass to the SceneObject constructor.