Free, open-source 3D sculpting for Linux, macOS and Windows: dense meshes, remeshing, painting, built-in AI (image/text to 3D), Send to Unreal, game-ready LODs, Gaussian splats and OpenUSD.
C++ 3d3d-sculptingcppdear-imguidigital-sculptingfbxgame-developmentgaussian-splattinggltfimage-to-3dmcpopenglopenusdsculptingtext-to-3dunreal-engine
Integration lanes: Blender add-on and Maya script release on their own tags
islandmedd6036a7b692b
diff --git a/.github/workflows/integrations.yml b/.github/workflows/integrations.ymlnew file mode 100644index 00000000..cc3104b5--- /dev/null+++ b/.github/workflows/integrations.yml@@ -0,0 +1,56 @@+name: Integrations++# The integration lanes (docs/design/release-lanes.md §2, docs/releasing.md "Integration releases"): the Blender+# add-on and the Maya script ship when they change, not with the app. A tag blender-vX.Y.Z or maya-vX.Y.Z (on main,+# whose file carries exactly that version) runs this: checks, the zip(s) and their SHA256SUMS.txt in a GitHub+# release of that name, never marked latest (the app's releases/latest stays the app), then the website again so+# its download links name the new release (pages.yml, step "Integration downloads"). No app version, update feed or+# package changes. What the two sides can read of each other is the bridge manifest's version, not the app's.++on:+ push:+ tags: ['blender-v[0-9]*', 'maya-v[0-9]*']++permissions:+ contents: write+ actions: write++concurrency:+ group: integrations-${{ github.ref_name }}++jobs:+ release:+ runs-on: ubuntu-24.04+ steps:+ - uses: actions/checkout@v7+ - name: Check, build+ run: |+ tag=$GITHUB_REF_NAME; lane=${tag%%-v*}; V=${tag#*-v}+ git fetch -q origin main+ git merge-base --is-ancestor "$GITHUB_SHA" origin/main || { echo "::error::$tag is not on main"; exit 1; }+ mkdir dist+ case $lane in+ blender)+ have=$(sed -n 's/^version = "\(.*\)"/\1/p' addons/blender/sculptforge_bridge/blender_manifest.toml)+ python3 addons/blender/build_addon.py --check --out dist+ [ "$have" != "$V" ] || cp "dist/sculptforge_bridge-$V.zip" dist/sculptforge_bridge.zip+ title="SculptForge Bridge for Blender $V" ;;+ maya)+ have=$(sed -n 's/^__version__ = "\(.*\)"/\1/p' integrations/maya/sculptforge_maya.py)+ python3 -I tests/maya/test_sculptforge_maya.py # mocked maya.cmds+ python3 -m zipfile -c dist/sculptforge_maya.zip integrations/maya/sculptforge_maya.py integrations/maya/README.md+ title="SculptForge for Maya $V" ;;+ esac+ [ "$have" = "$V" ] || { echo "::error::$tag but the file says $have: bump it on main first"; exit 1; }+ (cd dist && sha256sum * > SHA256SUMS.txt && cat SHA256SUMS.txt)+ { echo "lane=$lane"; echo "title=$title"; } >> "$GITHUB_ENV"+ - name: Release+ env:+ GH_TOKEN: ${{ github.token }}+ run: |+ notes="$title. Install and use: https://sculptforge.app/guide/$lane.html. Works with SculptForge releases that read bridge manifest version 1 or newer."+ gh release create "$GITHUB_REF_NAME" dist/* --title "$title" --notes "$notes" --latest=false --verify-tag+ - name: Website (download links name this release)+ env:+ GH_TOKEN: ${{ github.token }}+ run: gh workflow run pages.yml --ref maindiff --git a/.github/workflows/pages.yml b/.github/workflows/pages.ymlindex 7751663d..b29b59a6 100644--- a/.github/workflows/pages.yml+++ b/.github/workflows/pages.yml@@ -47,6 +47,19 @@ jobs:# No image or video that shows a mark goes out, whichever commit it came from (tools/marks_media_flagged.txt).- name: Media takedownrun: python3 tools/media_takedown.py website+ # The integration lanes (integrations.yml): the download links name the newest blender-v*/maya-v* release+ # once it exists, else the app's latest release, which carries the add-on too.+ - name: Integration downloads+ env:+ GH_TOKEN: ${{ github.token }}+ run: |+ for lane in blender maya; do+ t=$(git tag -l "$lane-v[0-9]*" --sort=-v:refname | head -1)+ [ -n "$t" ] && gh release view "$t" >/dev/null 2>&1 || continue+ f=sculptforge_maya.zip; [ $lane = maya ] || f=sculptforge_bridge.zip+ grep -rl --include='*.html' "releases/latest/download/$f" website | xargs -r sed -i "s#releases/latest/download/$f#releases/download/$t/$f#g"+ echo "$f -> $t"+ done# The apt and dnf repositories (sculptforge.app/apt and /rpm): the latest published release's signed metadata# and its .deb and .rpm files, each checked against that release's SHA256SUMS.txt (docs/design/package-repos.md).# Nothing until a release carries the metadata (it needs the REPO_SIGNING_KEY secret).@@ -124,6 +137,19 @@ jobs:# The mirror is public too: the same takedown as the deploy (tools/marks_media_flagged.txt).- name: Media takedownrun: python3 tools/media_takedown.py website+ # The integration lanes (integrations.yml): the download links name the newest blender-v*/maya-v* release+ # once it exists, else the app's latest release, which carries the add-on too.+ - name: Integration downloads+ env:+ GH_TOKEN: ${{ github.token }}+ run: |+ for lane in blender maya; do+ t=$(git tag -l "$lane-v[0-9]*" --sort=-v:refname | head -1)+ [ -n "$t" ] && gh release view "$t" >/dev/null 2>&1 || continue+ f=sculptforge_maya.zip; [ $lane = maya ] || f=sculptforge_bridge.zip+ grep -rl --include='*.html' "releases/latest/download/$f" website | xargs -r sed -i "s#releases/latest/download/$f#releases/download/$t/$f#g"+ echo "$f -> $t"+ done- name: Push website/ to islandmed/islandmed.github.ioenv:KEY: ${{ secrets.MIRROR_DEPLOY_KEY }}diff --git a/.github/workflows/release.yml b/.github/workflows/release.ymlindex 912421ae..e7b3e5e8 100644--- a/.github/workflows/release.yml+++ b/.github/workflows/release.yml@@ -342,11 +342,12 @@ jobs:cp "SculptForge-$V-linux-arm64.mcpb" SculptForge-linux-arm64.mcpb- name: MCP registry entry (server.json for the .mcpb bundles; publishing it is the maintainer's, docs/releasing.md)run: python3 tools/release/mcp_server_json.py --version "${TAG#v}" --dist dist+ # The add-on has its own version and lane (tags blender-vX.Y.Z, integrations.yml); each app release carries the+ # add-on as it is on the tagged commit, under its own version.- name: Blender add-on (extension and legacy zips, plus a version-less copy for the website's link)run: |- V=${TAG#v}- python3 addons/blender/build_addon.py --check --version "$V" --out dist- cp "dist/sculptforge_bridge-$V.zip" dist/sculptforge_bridge.zip+ python3 addons/blender/build_addon.py --check --out dist+ cp dist/sculptforge_bridge-*[0-9].zip dist/sculptforge_bridge.zip- name: Maya shelf script (Python source and its README; nothing to build)run: python3 -m zipfile -c dist/sculptforge_maya.zip integrations/maya/sculptforge_maya.py integrations/maya/README.md- name: Software bill of materials (CycloneDX; covered by the checksums and their signature)diff --git a/CMakeLists.txt b/CMakeLists.txtindex 09f7b670..5f08b8d9 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -665,8 +665,8 @@ find_package(Python3 COMPONENTS Interpreter QUIET)if(Python3_Interpreter_FOUND)add_custom_target(blender_addonCOMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/addons/blender/build_addon.py --check- --version ${PROJECT_VERSION} --out ${CMAKE_CURRENT_BINARY_DIR}/blender-addon- COMMENT "Packaging the Blender add-on (sculptforge_bridge-${PROJECT_VERSION}.zip)")+ --out ${CMAKE_CURRENT_BINARY_DIR}/blender-addon+ COMMENT "Packaging the Blender add-on (its own version: addons/blender/sculptforge_bridge/blender_manifest.toml)")endif()# --- Tests ---@@ -747,7 +747,7 @@ if(SCULPTFORGE_BUILD_TESTS)endif()# The add-on's zips build and its manifest passes the checks Blender's validator makes.add_test(NAME blender_addon_package COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/addons/blender/build_addon.py- --check --version ${PROJECT_VERSION} --out ${CMAKE_CURRENT_BINARY_DIR}/blender-addon)+ --check --out ${CMAKE_CURRENT_BINARY_DIR}/blender-addon)# The Maya shelf script (integrations/maya, #42) with a mocked maya.cmds, round-tripped through sculptforge-cli.add_test(NAME maya_shelf_script COMMAND ${Python3_EXECUTABLE} -I ${CMAKE_CURRENT_SOURCE_DIR}/tests/maya/test_sculptforge_maya.py--cli ${SCULPTFORGE_CLI_RUNNER})diff --git a/addons/blender/sculptforge_bridge/__init__.py b/addons/blender/sculptforge_bridge/__init__.pyindex c5bb8c5a..77c47f09 100644--- a/addons/blender/sculptforge_bridge/__init__.py+++ b/addons/blender/sculptforge_bridge/__init__.py@@ -15,7 +15,7 @@bl_info = { # legacy add-on install (Blender 4.2+ reads blender_manifest.toml instead)"name": "SculptForge Bridge","author": "SculptForge contributors",- "version": (0, 7, 0),+ "version": (1, 0, 0),"blender": (4, 2, 0),"location": "3D View > Sidebar > SculptForge, Object menu, File > Import / Export","description": "Send meshes to SculptForge and back, updating the objects in place",diff --git a/addons/blender/sculptforge_bridge/blender_manifest.toml b/addons/blender/sculptforge_bridge/blender_manifest.tomlindex 645804af..44b26855 100644--- a/addons/blender/sculptforge_bridge/blender_manifest.toml+++ b/addons/blender/sculptforge_bridge/blender_manifest.toml@@ -1,7 +1,7 @@schema_version = "1.0.0"id = "sculptforge_bridge"-version = "0.7.0"+version = "1.0.0"name = "SculptForge Bridge"tagline = "Send meshes to SculptForge and back, updated in place"maintainer = "SculptForge contributors"diff --git a/changes/feat-integration-lanes.md b/changes/feat-integration-lanes.mdnew file mode 100644index 00000000..51e4825d--- /dev/null+++ b/changes/feat-integration-lanes.md@@ -0,0 +1,6 @@+---+changed: **Blender add-on and Maya script have their own versions** and can be released on their own, as soon as+ they change (GitHub releases `blender-vX.Y.Z` / `maya-vX.Y.Z`); the website's download links follow the newest one.+ The add-on is now 1.0.0 (it used to carry the app's version). Each SculptForge release still includes both.+---+docs/design/release-lanes.md §2 (on feat/release-lanes); first tags after this merges: blender-v1.0.0, maya-v1.0.0.diff --git a/docs/releasing.md b/docs/releasing.mdindex 9c877b54..54ee9a97 100644--- a/docs/releasing.md+++ b/docs/releasing.md@@ -191,6 +191,24 @@ What keeps the insiders token from leaking; `tools/release/check_workflows.py` (- islandmed/sculptforge-insiders: private, members invited with `permission=pull` only, ruleset on `main`: no forcepush, no deletion.+## Integration releases (Blender add-on, Maya script)++They have their own versions and ship when they change, not with the app (docs/design/release-lanes.md §2):+`version` in `addons/blender/sculptforge_bridge/blender_manifest.toml` (and `bl_info`), `__version__` in+`integrations/maya/sculptforge_maya.py`. To release one, land the version bump on main like any change (notes in+`changes/<branch>.md`), then the release coordinator tags that commit:++```sh+git tag blender-v1.1.0 origin/main && git push origin blender-v1.1.0 # or maya-vX.Y.Z+```++`.github/workflows/integrations.yml` checks the tag is on main and matches the file, runs the checks, publishes the+zip(s) and SHA256SUMS.txt as a GitHub release of that name (never "latest": that stays the app), and redeploys the+website, whose download links then name it (pages.yml, "Integration downloads"). Each app release still carries the+add-on and the script as they are on its commit. Compatibility is the bridge manifest's `version` (`VERSION` in+`bridge_protocol.py` and the Maya script; the app checks it in src/io/BlenderBridge.cpp): raise it only for a change the other+side can't read, and both sides already say "update SculptForge" / "update this script" for a newer one.+## MCP registry (by hand, the maintainer's account)Each release carries the Claude Desktop bundles (`SculptForge-<version>-<os>.mcpb`, tools/release/build_mcpb.py,diff --git a/integrations/maya/sculptforge_maya.py b/integrations/maya/sculptforge_maya.pyindex dee9b57a..4286b8d6 100644--- a/integrations/maya/sculptforge_maya.py+++ b/integrations/maya/sculptforge_maya.py@@ -24,6 +24,10 @@ Plain maya.cmds (maya.mel for the shelf, maya.utils for Auto, maya.api.OpenMaya'standard library. Install: see README.md beside this file, or run install_shelf() once."""+# This script's own version (its integration lane: a tag maya-vX.Y.Z releases it, docs/releasing.md). What it can+# read from SculptForge is the manifest VERSION below, not the app's version.+__version__ = "1.0.0"+import jsonimport osimport re