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
Merge remote-tracking branch 'origin/feat/i18n' into feat/inbox2
islandmed547e1c652aa7
diff --cc src/app/Config.cppindex 5af5c12e,93cf9563..431fddb1--- a/src/app/Config.cpp+++ b/src/app/Config.cpp@@@ -671,7 -658,7 +674,8 @@@ bool App::readUiConfig(const std::strinlayout_.customize = customize;actions_.overridesFromJson(j["shortcuts"]);fromJson(j["prefs"], uiPrefs_);+ if (j.has("radialMenus")) applyRadialMenusJson(j["radialMenus"]); // (an older file keeps the menus there are)+ setLanguage(languageFromCode(uiPrefs_.language));applyPerformancePrefs();applyInputStyle();doc_.sculptor.dyntopo.constantDetail = uiPrefs_.dyntopoConstantDetail;diff --cc src/app/PanelMasking.cppindex 337e35bc,487c5133..11c36370--- a/src/app/PanelMasking.cpp+++ b/src/app/PanelMasking.cpp@@@ -209,30 -210,8 +210,30 @@@ void App::drawMaskingSection()// The group id as a drag field the size of the button beside it (Ctrl+click or double-click types a number),// rather than an input with tiny - and + buttons.ImGui::SetNextItemWidth(-1);- if (ImGui::DragInt("##maskgroup", &maskGroup_, 0.1f, 0, 1 << 30, "Group %d", ImGuiSliderFlags_AlwaysClamp))+ if (ImGui::DragInt("##maskgroup", &maskGroup_, 0.1f, 0, 1 << 30, tr("Group %d"), ImGuiSliderFlags_AlwaysClamp))maskGroup_ = std::max(0, maskGroup_);++ // Mask from the mesh border (#61): open edges, optionally polygroup borders, a few rings wide.+ if (ImGui::Button("By border##mask", ImVec2(half, 0)))+ runCommand("mask_border", {{"rings", double(maskBorderRings_)},+ {"polygroups", maskBorderGroups_},+ {"soft", maskBorderSoft_},+ {"strength", double(maskStrength_)}});+ ui::HelpText("By border", nullptr,+ "Mask the open edges of the mesh and the edge rings inside them, so sculpting never moves the "+ "border (Blender: Mask from mesh boundary). Replaces the mask and uses the mask strength. A closed "+ "mesh has no open edges.",+ "Tool > Masking");+ ImGui::SameLine();+ ImGui::SetNextItemWidth(-1);+ tray::SliderInt("##maskborderrings", &maskBorderRings_, 1, 20, "Rings %d");+ ui::Checkbox("Polygroup borders##maskborder", &maskBorderGroups_);+ ui::HelpText("Polygroup borders", nullptr,+ "By border also masks where polygroups meet (ZBrush: Mask by polygroup border).", "Tool > Masking");+ ImGui::SameLine();+ ui::Checkbox("Soft##maskborder", &maskBorderSoft_);+ ui::HelpText("Soft", nullptr, "By border fades the mask from the border towards the innermost ring.",+ "Tool > Masking");}} // namespace sfdiff --cc src/app/PanelProject.cppindex a779a94c,f9cdc771..a758ea84--- a/src/app/PanelProject.cpp+++ b/src/app/PanelProject.cpp@@@ -614,9 -614,8 +615,9 @@@ void App::drawUpdateBanner()if (guide_.bodyBoldFont()) ImGui::PopFont();if (ImFont* body = guide_.bodyFont()) ImGui::PushFont(body);ImGui::SameLine();- ImGui::TextDisabled("(you have %s)", SCULPTFORGE_VERSION);+ ImGui::TextDisabled(tr("(you have %s)"), SCULPTFORGE_VERSION);for (const auto& h : u.highlights) ImGui::BulletText("%s", h.c_str());+ ImGui::TextDisabled("%s", kInsiderNote); // memberships (Support.h): honest about what's not running yetif (guide_.bodyFont()) ImGui::PopFont();ImGui::Spacing();bool close = false;@@@ -627,11 -626,9 +628,11 @@@close = true;}ImGui::SameLine();- if (ImGui::Button("Become an Insider")) openSupportPage();++ if (ImGui::Button(tr("Become an Insider"))) openSupportPage();+ ImGui::SameLine();- if (ImGui::Button("Later")) close = true;+ if (ImGui::Button(tr("Later"))) close = true;ImGui::SameLine();- if (ImGui::Button("Skip this version")) {+ if (ImGui::Button(tr("Skip this version"))) {updateSkipped_ = u.version;saveProjectPrefs();close = true;