Skip to content

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.

Brush packs: Panel Line -> Panel Groove (it shadowed the gallery brush); brush_gallery counts 67/68

islandmedc787e379939b
diff --git a/REPORT-contact-sheet.jpg b/REPORT-contact-sheet.jpg
index 6636e766..169fefe6 100644
Binary files a/REPORT-contact-sheet.jpg and b/REPORT-contact-sheet.jpg differ
diff --git a/REPORT.md b/REPORT.md
index 644e67d8..24fb1992 100644
--- a/REPORT.md
+++ b/REPORT.md
@@ -49,6 +49,9 @@ All enforced by tests (`test_brush_packs.cpp`, `test_brushes.cpp`, `test_masking
Cut tear and faint textures fixed).
## Notes for the merger
+- Fix 11-03 (merge0109): pack brush 'Panel Line' renamed 'Panel Groove' (it hid the community gallery's Panel Line
+ Install button); brush_gallery.sfui counts 7/8 -> 67/68; new unit test brush_packs_names_clear_of_the_gallery keeps
+ pack names off the gallery seed index. ui_brush_gallery and ui_brush_packs pass.
- Merges cleanly onto origin/main (17 commits ahead at push time).
- Library projects are now A-Z by default (were newest first); **Sort: Recent** gives the old order.
- Projects save all brushes incl. the 60 pack recipes in the manifest (~25 KB more JSON); unchanged ones load back as
diff --git a/docs/guide/brush-packs.md b/docs/guide/brush-packs.md
index 1405bd76..c1425023 100644
--- a/docs/guide/brush-packs.md
+++ b/docs/guide/brush-packs.md
@@ -50,7 +50,7 @@ Crisp planes, panel lines, bevels, rivets and bolts for props, armour and machin
| Brush | What it does | Alpha |
|---|---|---|
-| **Panel Line** | Cuts a clean, narrow groove for panel gaps and seams. | |
+| **Panel Groove** | Cuts a clean, narrow groove for panel gaps and seams. | |
| **Flat Plane** | Presses a perfectly flat face with a hard edge, for machined surfaces. | Square |
| **Bevel Scrape** | Scrapes high points into a bevel along an edge, for chamfers. | |
| **Raised Plate** | Builds a flat, square-edged plate on the surface, for armour and hull panels. | Square |
diff --git a/docs/guide/images/brush-packs/hard-surface.jpg b/docs/guide/images/brush-packs/hard-surface.jpg
index befe54de..752863d4 100644
Binary files a/docs/guide/images/brush-packs/hard-surface.jpg and b/docs/guide/images/brush-packs/hard-surface.jpg differ
diff --git a/src/core/BrushPacks.cpp b/src/core/BrushPacks.cpp
index 6ffb7c2b..9ee0d676 100644
--- a/src/core/BrushPacks.cpp
+++ b/src/core/BrushPacks.cpp
@@ -80,7 +80,7 @@ void clayAndForm(PackBuilder b) {
}
void hardSurface(PackBuilder b) {
- b("Panel Line", "Cuts a clean, narrow groove for panel gaps and seams.", [](BrushRecipe& r) {
+ b("Panel Groove", "Cuts a clean, narrow groove for panel gaps and seams.", [](BrushRecipe& r) {
r.depth = -0.4f; r.pinch = 0.25f; r.hardness = 0.4f; r.tipSharpness = 0.3f; r.spacing = 0.08f;
r.frontFacesOnly = true;
});
diff --git a/tests/test_brush_packs.cpp b/tests/test_brush_packs.cpp
index 34b333a2..a0151a15 100644
--- a/tests/test_brush_packs.cpp
+++ b/tests/test_brush_packs.cpp
@@ -7,6 +7,7 @@
#include "app/BrushPreview.h"
#include "core/BrushAlpha.h"
+#include "core/BrushGallery.h"
#include "core/BrushPacks.h"
#include "core/BrushRecipe.h"
#include "core/ListSort.h"
@@ -16,6 +17,8 @@
#include <cmath>
#include <cstdio>
#include <cstdlib>
+#include <fstream>
+#include <iterator>
#include <map>
#include <set>
@@ -154,3 +157,20 @@ TEST(list_sort_orders) {
CHECK(listSortFromId(listSortId(ListSort::Pack)) == ListSort::Pack);
CHECK(listSortFromId("nonsense") == ListSort::AZ);
}
+
+// A built-in pack brush must not share a name with a community gallery brush: the gallery would show it as
+// installed and offer no Install (brush_gallery.sfui).
+TEST(brush_packs_names_clear_of_the_gallery) {
+ std::ifstream f(std::string(SF_TEST_DATA_DIR) + "/../../tools/brush-gallery/repo/index.json", std::ios::binary);
+ CHECK(f.good());
+ const std::string text((std::istreambuf_iterator<char>(f)), std::istreambuf_iterator<char>());
+ GalleryIndex index;
+ std::string error;
+ CHECK(parseGalleryIndex(text, index, error));
+ CHECK(index.brushes.size() >= 20);
+ for (const BrushRecipe& r : builtinPackRecipes())
+ for (const GalleryBrush& g : index.brushes) {
+ if (r.name == g.name) std::printf(" pack brush %s is also a gallery brush\n", r.name.c_str());
+ CHECK(r.name != g.name);
+ }
+}
diff --git a/tests/ui/brush_gallery.sfui b/tests/ui/brush_gallery.sfui
index acc1598c..2d358647 100644
--- a/tests/ui/brush_gallery.sfui
+++ b/tests/ui/brush_gallery.sfui
@@ -3,7 +3,7 @@
# gallery that can't be reached shows a clear error instead of an empty window.
run ui_look look=classic layout=zbrush # written for the Classic look and the ZBrush-style palette bar and shelves
env SCULPTFORGE_BRUSH_GALLERY $SCRIPT_DIR/../../tools/brush-gallery/repo
-expect_value brushes == 7
+expect_value brushes == 67
click "Brush##palette.brush"
click "Community brushes##ui.brush_gallery"
wait_idle 30
@@ -25,7 +25,7 @@ shot search
click "Install##Snake Scales"
wait_idle 30
expect "Installed##Snake Scales"
-expect_value brushes == 8
+expect_value brushes == 68
expect_status Snake Scales
shot installed