Compare commits
12 Commits
2.21.0-rc1
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| f2efbf57bb | |||
| 74347fe5e0 | |||
| a7c6969a4a | |||
| 423c145984 | |||
| c6ecf55f59 | |||
| c402a388d8 | |||
| bc3d4d26d2 | |||
| 9397774e24 | |||
| ddbcb7ee39 | |||
| 105bb00304 | |||
| ffd4da1ed9 | |||
| 26ba5c921b |
@@ -6,7 +6,7 @@ orbs:
|
||||
jobs:
|
||||
package-connector:
|
||||
docker:
|
||||
- image: cimg/python:3.11.0
|
||||
- image: cimg/python:3.11.12
|
||||
steps:
|
||||
- checkout
|
||||
- run:
|
||||
@@ -30,7 +30,7 @@ jobs:
|
||||
|
||||
build-connector-zip:
|
||||
docker:
|
||||
- image: cimg/python:3.11.0
|
||||
- image: cimg/python:3.11.12
|
||||
steps:
|
||||
- attach_workspace:
|
||||
at: ./
|
||||
@@ -44,10 +44,10 @@ jobs:
|
||||
root: ./
|
||||
paths:
|
||||
- bpy_speckle.zip
|
||||
|
||||
|
||||
get-ci-tools: # Clones our ci tools and persists them to the workspace
|
||||
docker:
|
||||
- image: cimg/base:2021.01
|
||||
- image: cimg/base:2025.04
|
||||
steps:
|
||||
- add_ssh_keys:
|
||||
fingerprints:
|
||||
@@ -104,7 +104,7 @@ jobs:
|
||||
- run:
|
||||
name: Sync Certs
|
||||
command: |
|
||||
& $env:SSM\smksp_cert_sync.exe
|
||||
& $env:SSM\smctl.exe windows certsync
|
||||
- run:
|
||||
name: Build Installer
|
||||
command: speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\blender.iss /Sbyparam=$p /DSIGN_INSTALLER /DCODE_SIGNING_CERT_FINGERPRINT=%SM_CODE_SIGNING_CERT_SHA1_HASH%
|
||||
@@ -166,7 +166,7 @@ jobs:
|
||||
|
||||
build-installer-manual:
|
||||
docker:
|
||||
- image: cimg/base:2021.01
|
||||
- image: cimg/base:2025.04
|
||||
parameters:
|
||||
slug:
|
||||
type: string
|
||||
@@ -228,7 +228,7 @@ workflows:
|
||||
filters: &build_filters
|
||||
tags:
|
||||
only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?(?:\.[0-9]+)?/
|
||||
|
||||
|
||||
- build-connector-zip:
|
||||
requires:
|
||||
- package-connector
|
||||
|
||||
@@ -13,13 +13,13 @@ from bpy_speckle.properties import *
|
||||
from bpy_speckle.ui import *
|
||||
|
||||
bl_info = {
|
||||
"name": "SpeckleBlender 2.0",
|
||||
"name": "SpeckleBlender 2.0 (Legacy)",
|
||||
"author": "Speckle Systems",
|
||||
"version": (0, 2, 0),
|
||||
"blender": (2, 92, 0),
|
||||
"location": "3d viewport toolbar (N), under the Speckle tab.",
|
||||
"description": "The Speckle Connector using specklepy 2.0!",
|
||||
"warning": "This add-on is WIP and should be used with caution",
|
||||
"description": "(Legacy) Speckle Connector using specklepy 2.0!",
|
||||
"warning": "This is a legacy add-on. Download the new connector from https://app.speckle.systems/connectors",
|
||||
"wiki_url": "https://github.com/specklesystems/speckle-blender",
|
||||
"category": "Scene",
|
||||
}
|
||||
|
||||
@@ -168,6 +168,7 @@ def install_requirements(host_application: str) -> None:
|
||||
"--prefer-binary",
|
||||
"--ignore-installed",
|
||||
"--no-compile",
|
||||
"--no-deps",
|
||||
"-t",
|
||||
str(path),
|
||||
"-r",
|
||||
|
||||
@@ -12,7 +12,7 @@ class OBJECT_PT_speckle(bpy.types.Panel):
|
||||
# bl_idname = 'OBJECT_PT_speckle'
|
||||
bl_region_type = "WINDOW"
|
||||
bl_context = "object"
|
||||
bl_label = "Speckle"
|
||||
bl_label = "Speckle (Legacy)"
|
||||
|
||||
def draw_header(self, context):
|
||||
self.layout.prop(context.object.speckle, "enabled", text="")
|
||||
|
||||
@@ -93,7 +93,7 @@ class VIEW3D_PT_SpeckleUser(bpy.types.Panel):
|
||||
|
||||
bl_space_type = "VIEW_3D"
|
||||
bl_region_type = Region
|
||||
bl_category = "Speckle"
|
||||
bl_category = "Speckle (Legacy)"
|
||||
bl_context = "objectmode"
|
||||
bl_label = "User Account"
|
||||
|
||||
@@ -101,6 +101,13 @@ class VIEW3D_PT_SpeckleUser(bpy.types.Panel):
|
||||
speckle = get_speckle(context)
|
||||
|
||||
layout = self.layout
|
||||
# Draw a box with the text "Warning: This is a legacy add-on. Download the new connector from https://app.speckle.systems/connectors"
|
||||
box = layout.box()
|
||||
box.label(text="Warning: This is a legacy add-on.", icon="ERROR")
|
||||
box.label(text="Download the new connector from")
|
||||
box.label(text="https://app.speckle.systems/connectors")
|
||||
layout.separator()
|
||||
|
||||
col = layout.column()
|
||||
|
||||
if len(speckle.users) < 1:
|
||||
@@ -121,7 +128,7 @@ class VIEW3D_PT_SpeckleStreams(bpy.types.Panel):
|
||||
|
||||
bl_space_type = "VIEW_3D"
|
||||
bl_region_type = Region
|
||||
bl_category = "Speckle"
|
||||
bl_category = "Speckle (Legacy)"
|
||||
bl_context = "objectmode"
|
||||
bl_label = "Projects"
|
||||
|
||||
@@ -149,7 +156,7 @@ class VIEW3D_PT_SpeckleActiveStream(bpy.types.Panel):
|
||||
|
||||
bl_space_type = "VIEW_3D"
|
||||
bl_region_type = Region
|
||||
bl_category = "Speckle"
|
||||
bl_category = "Speckle (Legacy)"
|
||||
bl_context = "objectmode"
|
||||
bl_label = "Active Project"
|
||||
|
||||
@@ -245,7 +252,7 @@ class VIEW3D_PT_SpeckleHelp(bpy.types.Panel):
|
||||
|
||||
bl_space_type = "VIEW_3D"
|
||||
bl_region_type = Region
|
||||
bl_category = "Speckle"
|
||||
bl_category = "Speckle (Legacy)"
|
||||
bl_context = "objectmode"
|
||||
bl_label = "Help"
|
||||
|
||||
|
||||
Generated
+781
-660
File diff suppressed because it is too large
Load Diff
+5
-2
@@ -4,11 +4,14 @@ version = "2.0.0"
|
||||
description = "the Speckle 2.0 connector for Blender!"
|
||||
authors = ["izzy lyseggen <izzy.lyseggen@gmail.com>", "Gergő Jedlicska <gergo@jedlicska.com>"]
|
||||
license = "Apache-2.0"
|
||||
package-mode = false
|
||||
|
||||
[tool.poetry.requires-plugins]
|
||||
poetry-plugin-export = ">=1.8"
|
||||
|
||||
[tool.poetry.dependencies]
|
||||
python = ">=3.9.0, <4.0.0"
|
||||
specklepy = "^2.20.2"
|
||||
attrs = "^23.1.0"
|
||||
specklepy = "^2.23.0"
|
||||
|
||||
# [tool.poetry.group.local_specklepy.dependencies]
|
||||
# specklepy = {path = "../specklepy", develop = true}
|
||||
|
||||
Reference in New Issue
Block a user