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
IP audit: tests follow the new names; listings and ComfyUI fixes
islandmedf7826183d2d9
diff --git a/integrations/comfyui/ComfyUI-SculptForge/sculptforge_comfy/nodes.py b/integrations/comfyui/ComfyUI-SculptForge/sculptforge_comfy/nodes.pyindex 6560b2ad..bed8572c 100644--- a/integrations/comfyui/ComfyUI-SculptForge/sculptforge_comfy/nodes.py+++ b/integrations/comfyui/ComfyUI-SculptForge/sculptforge_comfy/nodes.py@@ -118,7 +118,8 @@ def _output_ui(saved):class SculptForgeLoadMesh:- DESCRIPTION = ("Load a model file for the SculptForge nodes. Relative paths are looked up in ComfyUI's input folder.")+ DESCRIPTION = ("Load a model file (OBJ, FBX, GLB/glTF, PLY, STL, USD/USDZ, Bridge files or a SculptForge .sfproj) "+ "for the SculptForge nodes. Relative paths are looked up in ComfyUI's input folder.")CATEGORY = CATEGORYRETURN_TYPES = (SF_MESH,)RETURN_NAMES = ("mesh",)@@ -354,7 +355,7 @@ class SculptForgeMeshInfo:return {"required": {"mesh": (MESH_IN,)}, "hidden": {"unique_id": "UNIQUE_ID"}}def info(self, mesh, unique_id=None):- stdout = cli.run("open path=$IN; mesh_info; part_list", {"IN": _source(mesh)})+ stdout = cli.run("open path=$IN; mesh_info; subtool_list", {"IN": _source(mesh)}) # marks-pendinglines = [l.split(": ", 1)[-1] if re.match(r"^\w+: ", l) else l for l in stdout.strip().splitlines()[1:]]text = "\n".join(lines)paths.show_text(text, unique_id)diff --git a/integrations/comfyui/ComfyUI-SculptForge/tests/fake_cli.py b/integrations/comfyui/ComfyUI-SculptForge/tests/fake_cli.pyindex af7a9471..9052c833 100644--- a/integrations/comfyui/ComfyUI-SculptForge/tests/fake_cli.py+++ b/integrations/comfyui/ComfyUI-SculptForge/tests/fake_cli.py@@ -120,8 +120,8 @@ def main(argv):elif cmd == "mesh_info":print(f"mesh_info: {state['triangles'] // 2} vertices, {state['triangles']} triangles, ""bounds (-1, -1, -1) - (1, 1, 1)")- elif cmd == "part_list":- print(f"part_list: 1 Part:\n0. {state['name']} ({state['triangles']} triangles, active)")+ elif cmd == "subtool_list":+ print(f"subtool_list: 1 Part:\n0. {state['name']} ({state['triangles']} triangles, active)") # marks-pendingelse:fail(line, cmd, f"Unknown command '{cmd}'")diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILDindex b93e32d5..38f1e699 100644--- a/packaging/arch/PKGBUILD+++ b/packaging/arch/PKGBUILD@@ -2,7 +2,7 @@pkgname=sculptforgepkgver=0.10.10pkgrel=1-pkgdesc="Free, open-source digital sculpting app with the Classic sculpting keys available, for artists and game pipelines"+pkgdesc="Free, open-source digital sculpting app with classic sculpting keys, for artists and game pipelines"arch=('x86_64' 'aarch64')url="https://sculptforge.app/"license=('GPL-3.0-or-later')diff --git a/src/app/I18nSpanish.cpp b/src/app/I18nSpanish.cppindex 59bcb76b..88105735 100644--- a/src/app/I18nSpanish.cpp+++ b/src/app/I18nSpanish.cpp@@ -543,7 +543,6 @@ constexpr Entry kSpanish[] = {{"Auto collapse left tray", "Plegar sola la bandeja izquierda"},{"Auto collapse right tray", "Plegar sola la bandeja derecha"},{"Palettes strictly A-Z", "Paletas estrictamente de la A a la Z"},- {"Palettes strictly A-Z", "Paletas de la A a la Z"},{"Left-handed layout", "Diseño para zurdos"},{"Shelf tiles", "Fichas del estante"},{"UI scale", "Escala de la interfaz"},diff --git a/src/app/Input.cpp b/src/app/Input.cppindex 975c12cb..766d13ff 100644--- a/src/app/Input.cpp+++ b/src/app/Input.cpp@@ -83,7 +83,7 @@ void App::registerInputActions() {"inner ring of the brush cursor shows it.",[this] { PickerUi::sizePopup(*this, PickerUi::Slider::FocalShift); });add("ui.quickmenu", "Quick Menu", ICON_LC_LAYOUT_GRID, "Help", "Space",- "the Quick Menu under the cursor: brush, stroke, alpha, material, colour, Draw Size, Falloff and the "+ "The Quick Menu under the cursor: brush, stroke, alpha, material, colour, Draw Size, Falloff and the ""intensities. Hold Space and let go to close it, or tap Space to keep it open.",[this] { openQuickMenu(); }, [this] { return quickMenu_.open; });diff --git a/tests/maya/test_sculptforge_maya.py b/tests/maya/test_sculptforge_maya.pyindex 4734dfe2..acc1e240 100644--- a/tests/maya/test_sculptforge_maya.py+++ b/tests/maya/test_sculptforge_maya.py@@ -251,7 +251,7 @@ def faces(obj_text):def test_format(sm, tmp):check(sm.safe_name("pCube1") == "pCube1" and sm.safe_name("Body Hi") == "Body_Hi", "safe names")- check(sm.safe_name("3D") == "_3D" and sm.safe_name("") == "SubTool", "safe names: digits, empty")+ check(sm.safe_name("3D") == "_3D" and sm.safe_name("") == "Part", "safe names: digits, empty")check(sm.safe_name("Body Hi \u00fc") == "Body_Hi___", "safe names match SculptForge's (one '_' per byte)")check(len(sm.safe_name("x" * 1000)) == sm.MAX_NAME, "names are capped")for bad in ["", ".obj", "../x.obj", "a..b.obj", "/etc/x.obj", "C:\\x.obj", "c:x.obj", "a/b.obj", "x.mel",diff --git a/tests/test_actions.cpp b/tests/test_actions.cppindex 4cfba43e..2dd6c56e 100644--- a/tests/test_actions.cpp+++ b/tests/test_actions.cpp@@ -99,9 +99,9 @@ TEST(search_aliases_are_generic_words) {CHECK(has(searchAliasesIn("Show face groups"), "groups"));CHECK(searchAliasesIn("Partial redo").empty()); // whole words onlyCHECK(searchAliasesIn("Dynamic stroke spacing").empty()); // "Dynamic" only as the whole label- // Brushes: stored names stay (old projects, hotkeys and scripts), labels are SculptForge's.+ // Brushes: SculptForge's stored names; the old ones still load (core/LegacyNames.h).BrushType t = BrushType::Standard;- CHECK(std::string(brushName(BrushType::DamStandard)) == "DamStandard");+ CHECK(std::string(brushName(BrushType::DamStandard)) == "SharpCrease");CHECK(std::string(brushLabel(BrushType::DamStandard)) == "Sharp Crease");CHECK(brushFromName("DamStandard", t) && t == BrushType::DamStandard);CHECK(brushFromName("sharp crease", t) && t == BrushType::DamStandard);diff --git a/tests/test_brushes.cpp b/tests/test_brushes.cppindex 54920037..8401737e 100644--- a/tests/test_brushes.cpp+++ b/tests/test_brushes.cpp@@ -55,9 +55,9 @@ glm::vec3 moved(const Document& d, const std::vector<glm::vec3>& before, uint32_} // namespaceTEST(brush_names_cover_new_types) {- CHECK(std::string(brushName(BrushType::DamStandard)) == "DamStandard");- CHECK(std::string(brushName(BrushType::ClayBuildup)) == "ClayBuildup");- CHECK(std::string(brushName(BrushType::SnakeHook)) == "SnakeHook");+ CHECK(std::string(brushName(BrushType::DamStandard)) == "SharpCrease");+ CHECK(std::string(brushName(BrushType::ClayBuildup)) == "ClayBlock");+ CHECK(std::string(brushName(BrushType::SnakeHook)) == "Tendril");CHECK(std::string(brushName(BrushType::Trim)) == "Trim");CHECK(std::string(brushName(BrushType::Layer)) == "Layer");CHECK(std::string(brushName(BrushType::Nudge)) == "Nudge");diff --git a/tests/test_goz.cpp b/tests/test_goz.cppindex a4793a45..2b89a2be 100644--- a/tests/test_goz.cpp+++ b/tests/test_goz.cpp@@ -244,11 +244,11 @@ TEST(goz_commands_and_open) {std::filesystem::remove(path);r = reg.execute(doc, "open", {{"path", "model.zpr"}});- CHECK(!r.ok && r.message.find("proprietary") != std::string::npos && r.message.find("GoZ") != std::string::npos &&+ CHECK(!r.ok && r.message.find("proprietary") != std::string::npos && r.message.find("Bridge") != std::string::npos &&r.message.find("OBJ") != std::string::npos);// A .ztl without a conversion beside it points to the ZBrush plug-in.r = reg.execute(doc, "open", {{"path", "model.ZTL"}});- CHECK(!r.ok && r.message.find("proprietary") != std::string::npos && r.message.find("ZTL Export") != std::string::npos);+ CHECK(!r.ok && r.message.find("proprietary") != std::string::npos && r.message.find("export plug-in") != std::string::npos);}// The SculptForge ZTL Export plug-in writes <name>.sf<NNN>_<SubTool>.GoZ next to <name>.ztl; opening the .ztl@@ -292,7 +292,7 @@ TEST(goz_converted_ztool_opens_as_subtools) {// Without a conversion, a .ztl explains the plug-in; an empty folder is an error, not an empty scene.Document doc;CommandResult r = reg.execute(doc, "open", {{"path", (base / "Missing.ztl").string()}});- CHECK(!r.ok && r.message.find("ZTL Export") != std::string::npos);+ CHECK(!r.ok && r.message.find("export plug-in") != std::string::npos);fs::create_directories(base / "Empty.sculptforge");CHECK(!reg.execute(doc, "open", {{"path", (base / "Empty.sculptforge").string()}}).ok);fs::remove_all(base);diff --git a/tests/test_lightbox.cpp b/tests/test_lightbox.cppindex beb6206b..8e42e374 100644--- a/tests/test_lightbox.cpp+++ b/tests/test_lightbox.cpp@@ -189,49 +189,50 @@ TEST(quicksave_files) {TEST(brush_popup_letter_keys) {// The built-in brushes in the pop-up's order, plus a custom one.const std::vector<std::string> names = {"Standard", "Clay", "Smooth", "Move", "Inflate", "Crease",- "Flatten", "Pinch", "DamStandard", "ClayBuildup", "SnakeHook", "Trim",- "Layer", "Nudge", "Paint", "Clay Buildup"};+ "Flatten", "Pinch", "Sharp Crease", "Clay Block", "Tendril", "Trim",+ "Layer", "Nudge", "Paint", "Clay Bulk"};auto keyOf = [&](const std::vector<std::pair<char, size_t>>& badges, const std::string& brush) {for (const auto& [c, i] : badges)if (names[i] == brush) return c;return '\0';};- // B, then S: Standard is T, Smooth M, SnakeHook H (ZBrush's B S T, B S M, B S H).+ // B, then S: Standard is T, Smooth M, Tendril H (the classic B S T, B S M, B S H), Sharp Crease the next free letter.bool substring = true;auto kept = filterByTyped(names, "s", &substring);CHECK(!substring);- CHECK(kept.size() == 3);+ CHECK(kept.size() == 4);auto badges = letterBadges(names, kept, "s");CHECK(keyOf(badges, "Standard") == 't');CHECK(keyOf(badges, "Smooth") == 'm');- CHECK(keyOf(badges, "SnakeHook") == 'h');- // C: Clay L, Crease R, ClayBuildup B (ZBrush's B C B), and the custom "Clay Buildup" the first free letter (A).+ CHECK(keyOf(badges, "Tendril") == 'h');+ CHECK(keyOf(badges, "Sharp Crease") == 'a');+ // C: Clay L, Crease R, Clay Block B (the classic B C B), and the custom "Clay Bulk" the first free letter (A).kept = filterByTyped(names, "c");badges = letterBadges(names, kept, "c");CHECK(kept.size() == 4);CHECK(keyOf(badges, "Clay") == 'l');CHECK(keyOf(badges, "Crease") == 'r');- CHECK(keyOf(badges, "ClayBuildup") == 'b');- CHECK(keyOf(badges, "Clay Buildup") == 'a');- // ZBrush's keys for the brushes both apps have: B D S, B M V, B I N, B P I.- CHECK(keyOf(letterBadges(names, filterByTyped(names, "d"), "d"), "DamStandard") == 's');+ CHECK(keyOf(badges, "Clay Block") == 'b');+ CHECK(keyOf(badges, "Clay Bulk") == 'a');+ // The classic keys: B D S, B M V, B I N, B P I.+ CHECK(keyOf(letterBadges(names, filterByTyped(names, "d"), "d"), "Sharp Crease") == 's');CHECK(keyOf(letterBadges(names, filterByTyped(names, "m"), "m"), "Move") == 'v');CHECK(keyOf(letterBadges(names, filterByTyped(names, "i"), "i"), "Inflate") == 'n');CHECK(keyOf(letterBadges(names, filterByTyped(names, "p"), "p"), "Pinch") == 'i');- CHECK(keyOf(letterBadges(names, filterByTyped(names, "s"), "s"), "SnakeHook") == 'h');+ CHECK(keyOf(letterBadges(names, filterByTyped(names, "s"), "s"), "Tendril") == 'h');// Every key is unique.for (size_t i = 0; i < badges.size(); ++i)for (size_t j = i + 1; j < badges.size(); ++j)CHECK(badges[i].first != badges[j].first);- // Nothing starts with "hook": fall back to names containing it, without keys.- kept = filterByTyped(names, "hook", &substring);+ // Nothing starts with "dril": fall back to names containing it, without keys.+ kept = filterByTyped(names, "dril", &substring);CHECK(substring);- CHECK(kept.size() == 1 && names[kept[0]] == "SnakeHook");- CHECK(letterBadges(names, kept, "hook").empty());+ CHECK(kept.size() == 1 && names[kept[0]] == "Tendril");+ CHECK(letterBadges(names, kept, "dril").empty());// Nothing typed: everything, no keys.CHECK(filterByTyped(names, "").size() == names.size());CHECK(letterBadges(names, filterByTyped(names, ""), "").empty());- CHECK(typedName("Clay Buildup!") == "claybuildup");+ CHECK(typedName("Clay Block!") == "clayblock");}// #90: Library > Projects listed each project twice on Windows: the User folder is joined with "/", recent files arediff --git a/tests/ui/custom_matcaps.sfui b/tests/ui/custom_matcaps.sfuiindex e272527a..4bde3f5e 100644--- a/tests/ui/custom_matcaps.sfui+++ b/tests/ui/custom_matcaps.sfui@@ -54,9 +54,9 @@ expect_value material_custom == 1expect_value custom_matcaps == 2expect_status "sf_ui_custom_matcap"-# Images added to the MatCaps folder while the app runs show up when a material list opens.+# Images added to the Lit Spheres folder while the app runs show up when a material list opens.env XDG_DATA_HOME $LIBRARY/.trash-test-copy data/Rose.png $LIBRARY/MatCaps/Pink.png+copy data/Rose.png "$LIBRARY/Lit Spheres/Pink.png"expect_value custom_matcaps == 2click "Material##palette.material"wait_idle 20diff --git a/tests/ui/dyntopo.sfui b/tests/ui/dyntopo.sfuiindex ba129dff..791d1f31 100644--- a/tests/ui/dyntopo.sfui+++ b/tests/ui/dyntopo.sfui@@ -7,7 +7,7 @@ expect "Dynamic##draw.dynamic"expect_not "##dyntopo_detail"hold ctrlhover "Dynamic##draw.dynamic"-expect_help "Sculptris Pro"+expect_help "brushes add triangles"expect_help "subdivision levels"hold nonediff --git a/tests/ui/gizmo.sfui b/tests/ui/gizmo.sfuiindex 9ea8dd0b..715b7e16 100644--- a/tests/ui/gizmo.sfui+++ b/tests/ui/gizmo.sfui@@ -135,7 +135,7 @@ expect_help "soft joint"hover "Gizmo/To Surface##gizmo.snap_pivot"expect_help "Alt+click"hover "Gizmo/All Parts##gizmo.all"-expect_help "Transpose All"+expect_help "every visible Part together"hover "Rotate##tool.rotate"expect_help "pose a limb"key ctrl+f1diff --git a/tests/ui/qremesh_guides.sfui b/tests/ui/qremesh_guides.sfuiindex e3bc69d4..d45ad88b 100644--- a/tests/ui/qremesh_guides.sfui+++ b/tests/ui/qremesh_guides.sfui@@ -9,7 +9,7 @@ expect_value qremesh_guides == 0# Ctrl-hover help on the new controls.hold ctrlhover "QRemesh/Quad Remesh Guides"-expect_help "ZRemesher Guides"+expect_help "edge loops to follow"hover "QRemesh/Delete Last"expect_help "last Quad Remesh guide"hover "QRemesh/Clear"diff --git a/tests/ui/retopo.sfui b/tests/ui/retopo.sfuiindex b22a956a..5125a0ff 100644--- a/tests/ui/retopo.sfui+++ b/tests/ui/retopo.sfui@@ -15,7 +15,7 @@ expect_value quads == 0# Ctrl-hover help on the new controls.hold ctrlhover "QRemesh/Quad Remesh"-expect_help "ZRemesher"+expect_help "all-quad topology"hover "QRemesh/Keep Groups"expect_help "face group borders"hover "QRemesh/Double"diff --git a/tools/marks_pending.txt b/tools/marks_pending.txtindex 6f02709b..bf2a01ef 100644--- a/tools/marks_pending.txt+++ b/tools/marks_pending.txt@@ -4,6 +4,7 @@ website/guide/search-index.js skip # built from docs/guide, whichsrc/** stringstests/** skip # test code and data: phase 2 (identifiers, comments, fixtures)addons/** strings+integrations/comfyui/** strings # calls subtool_list; command names follow phase 2tools/guide/** stringstools/looks/** stringstools/export_check/** stringsdiff --git a/tools/publish/setup-channels.sh b/tools/publish/setup-channels.shindex 137f0e7c..014026b7 100755--- a/tools/publish/setup-channels.sh+++ b/tools/publish/setup-channels.sh@@ -81,7 +81,7 @@ cask "sculptforge" dourl "https://github.com/$REPO/releases/download/v#{version}/SculptForge-#{version}-darwin-universal.dmg",verified: "github.com/$REPO/"name "SculptForge"- desc "Free, open-source digital sculpting, a free, open-source sculpting app"+ desc "Free, open-source digital sculpting app"homepage "https://sculptforge.app/"livecheck do