Merge branch 'main' into occ-nurbs

Author: tomvanmele

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.9.1
+current_version = 1.9.2
 message = Bump version to {new_version}
 commit = True
 tag = True

CHANGELOG.md

@@ -9,11 +9,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+### Changed
+
+### Removed
+
+
+## [1.9.2] 2021-11-02
+
+### Added
+
 * Added `draw_mesh` method to `compas_ghpython.artists.MeshArtist` to match all other mesh artists.
 
 ### Changed
 
 * Changed new artist registration to check if subclass.
+* Fixed `RobotModelArtist` for blender: missing abstract method impl and handle init order.
 
 ### Removed
 

docs/conf.py

@@ -38,7 +38,7 @@ def patched_m2r2_setup(app):
 copyright = "Block Research Group - ETH Zurich"
 author = "Tom Van Mele"
 
-release = "1.9.1"
+release = "1.9.2"
 version = ".".join(release.split(".")[0:2])
 
 master_doc = "index"

setup.py

@@ -25,7 +25,7 @@ def read(*names, **kwargs):
 
 setup(
     name='COMPAS',
-    version='1.9.1',
+    version='1.9.2',
     description='The COMPAS framework',
     long_description=long_description,
     long_description_content_type='text/markdown',

src/compas/__init__.py

@@ -91,7 +91,7 @@
 __license__ = 'MIT License'
 __email__ = '[email protected]'
 
-__version__ = '1.9.1'
+__version__ = '1.9.2'
 
 version = LooseVersion(compas.__version__)
 versionstring = version.vstring.split('-')[0]

src/compas_blender/__init__.py

@@ -50,7 +50,7 @@ def redraw():
     bpy.ops.wm.redraw_timer(type='DRAW_WIN_SWAP', iterations=1)
 
 
-__version__ = '1.9.1'
+__version__ = '1.9.2'
 
 
 def _check_blender_version(version):

src/compas_blender/artists/artist.py

@@ -21,11 +21,10 @@ class BlenderArtist(Artist):
     def __init__(self,
                  collection: Optional[Union[str, bpy.types.Collection]] = None,
                  **kwargs: Any):
-
-        super().__init__(**kwargs)
-
+        # Initialize collection before even calling super because other classes depend on that
         self._collection = None
         self.collection = collection
+        super().__init__(**kwargs)
 
     @property
     def collection(self) -> bpy.types.Collection:

src/compas_blender/artists/robotmodelartist.py

@@ -60,20 +60,28 @@ def create_geometry(self,
     def redraw(self, timeout: float = 0.0) -> None:
         bpy.ops.wm.redraw_timer(type='DRAW_WIN_SWAP', iterations=1, time_limit=timeout)
 
-    def clear(self) -> None:
-        compas_blender.delete_objects(self.collection.objects)
+    def _ensure_geometry(self):
+        if len(self.collection.objects) == 0:
+            self.create()
+
+    def draw(self) -> None:
+        self._ensure_geometry()
+        self.draw_visual()
 
     def draw_visual(self) -> None:
+        self._ensure_geometry()
         visuals = super(RobotModelArtist, self).draw_visual()
         for visual in visuals:
             visual.hide_set(False)
 
     def draw_collision(self) -> None:
+        self._ensure_geometry()
         collisions = super(RobotModelArtist, self).draw_collision()
         for collision in collisions:
             collision.hide_set(False)
 
     def draw_attached_meshes(self) -> None:
+        self._ensure_geometry()
         meshes = super(RobotModelArtist, self).draw_attached_meshes()
         for mesh in meshes:
             mesh.hide_set(False)

src/compas_ghpython/__init__.py

@@ -22,7 +22,7 @@
     from .utilities import *  # noqa: F401 F403
 
 
-__version__ = '1.9.1'
+__version__ = '1.9.2'
 
 
 def get_grasshopper_plugin_path(version):

src/compas_plotters/__init__.py

@@ -18,7 +18,7 @@
 
 """
 
-__version__ = '1.9.1'
+__version__ = '1.9.2'
 
 from .core import *  # noqa: F401 F403
 # from .artists import *  # noqa: F401 F403