Merge pull request #75 from specklesystems/izzy/add-parent-type

feat(convert): add parent type to display meshes
2021-12-09 10:59:28 +00:00 · 2021-12-09 10:58:22 +00:00 · 2021-12-07 16:26:58 +00:00 · 2021-12-07 16:22:42 +00:00 · 2021-12-07 16:05:51 +00:00 · 2021-12-07 16:05:23 +00:00
2 changed files with 23 additions and 13 deletions
@@ -20,6 +20,25 @@ jobs:
      - checkout
      - attach_workspace:
          at: ./
+      - run: 
+          name: Install specklepy with python 3.7
+          shell: powershell.exe
+          command: |
+            $pyarr=(python --version).split(' ')[1].split('.')
+            $pyver=($pyarr[0..1] -join '.')
+            echo "using python version:" $pyver
+            $specklepy=(python patch_version.py)
+            python -m pip install --target=./modules-$pyver specklepy==$specklepy
+      - run: 
+          name: Install python 3.9 and specklepy 
+          shell: powershell.exe
+          command: |
+            choco install python --version=3.9.2
+            $pyarr=(C:\Python39\python.exe --version).split(' ')[1].split('.')
+            $pyver=($pyarr[0..1] -join '.')
+            echo "using python version:" $pyver
+            $specklepy=(python patch_version.py)
+            C:\Python39\python.exe -m pip install --target=./modules-$pyver specklepy==$specklepy
      - run:
          name: Patch
          shell: powershell.exe
@@ -101,22 +120,10 @@ workflows:
              only:
                - main
                - /ci\/.*/
-      - install-specklepy:
-          matrix:
-            parameters:
-              tag: ["3.7", "3.9"]
-          filters:
-            tags:
-              only: /.*/
-            branches:
-              only:
-                - main
-                - /ci\/.*/
      - build-connector:
          slug: blender
          requires:
            - get-ci-tools
-            - install-specklepy
          filters:
            tags:
              only: /.*/
@@ -208,7 +208,7 @@ def from_speckle_object(speckle_object, scale, name=None):

        add_custom_properties(speckle_object, blender_object)
        add_blender_material(speckle_object, blender_object)
-        # TODO: chat with tom re transforms
+        # TODO: transforms
        # set_transform(speckle_object, blender_object)

        return blender_object
@@ -218,6 +218,9 @@ def from_speckle_object(speckle_object, scale, name=None):
        speckle_object, "displayMesh", getattr(speckle_object, "displayValue", None)
    )
    if mesh:
+        # add parent type here so we can use it as a blender custom prop
+        # not making it hidden, so it will get added on send as i think it might be helpful? can reconsider
+        mesh.parent_speckle_type = speckle_object.speckle_type
        return from_speckle_object(mesh, scale, speckle_name)

    # return none if fail
Author	SHA1	Message	Date
izzy lyseggen	6b872f11d9	Merge pull request #75 from specklesystems/izzy/add-parent-type feat(convert): add parent type to display meshes	2021-12-09 10:59:28 +00:00
izzy lyseggen	fd3742b800	feat(convert): add parent type to display meshes makes it easier to work w geo from places like revit	2021-12-09 10:58:22 +00:00
izzy lyseggen	870174a969	Merge pull request #73 from specklesystems/ci/fix-install-platform ci: fix install platform	2021-12-07 16:26:58 +00:00
izzy lyseggen	2c6dfcb340	ci: grab py version to ensure all is working	2021-12-07 16:22:42 +00:00
izzy lyseggen	4d3eacbe52	ci: no need to persist now i think	2021-12-07 16:05:51 +00:00
izzy lyseggen	df7d631b54	ci: bump to 3.9.2	2021-12-07 16:05:23 +00:00
izzy lyseggen	07ceb07058	ci: try ths install again!	2021-12-07 16:01:16 +00:00
izzy lyseggen	112bc56ded	ci: remove install specklepy step	2021-12-07 15:54:59 +00:00
izzy lyseggen	88e2744e93	ci: test in win exe	2021-12-07 15:53:52 +00:00