blender/blender-manual
24
24
Fork 105
Code Issues 76 Pull Requests 6 Projects 1 Releases Wiki Activity

UV: Document pack islands features and new ui #104468

Closed
Chris Blackbourn wants to merge 63 commits from Chris_Blackbourn/blender-manual:uv_pack_islands into blender-v3.6-release
pull from: Chris_Blackbourn/blender-manual:uv_pack_islands
merge into: blender:blender-v3.6-release

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 63 Files Changed 49 +10 -6
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fc48be3248 - Show all commits

4
manual/advanced/command_line/arguments.rst
View File

@ -9,8 +9,8 @@
Command Line Arguments Command Line Arguments
********************** **********************
Blender |BLENDER_VERSION| | Blender |BLENDER_VERSION|
Usage: blender [args ...] [file] [args ...] | Usage: ``blender [args ...] [file] [args ...]``
.. _command-line-args-render-options: .. _command-line-args-render-options:

12
tools_maintenance/blender_help_extract.py
View File

@ -14,9 +14,13 @@ import subprocess
# /path/to/blender \ # /path/to/blender \
# manual/advanced/command_line/arguments.rst # manual/advanced/command_line/arguments.rst
def help_text_make_version_substitution(text: str) -> str: def help_text_make_version_and_usage_substitution(text: str) -> str:
re_version = re.compile(r"^(Blender )(\d.*)$", flags=re.MULTILINE) re_version = re.compile(r"^(Blender )\d.*\n(Usage:\s+)(.*)$", flags=re.MULTILINE)
text = re.sub(re_version, lambda x: x.group(1) + "|BLENDER_VERSION|", text) text = re.sub(
re_version,
lambda x: "| " + x.group(1) + "|BLENDER_VERSION|\n| " + x.group(2) + "``" + x.group(3) + "``",
text,
)
return text return text
@ -168,7 +172,7 @@ def help_text_as_rst(text: str) -> str:
text = text.expandtabs(3) text = text.expandtabs(3)
text = "\n".join([l.rstrip() for l in text.splitlines()]) + "\n" text = "\n".join([l.rstrip() for l in text.splitlines()]) + "\n"
text = help_text_make_version_substitution(text) text = help_text_make_version_and_usage_substitution(text)
text = help_text_make_args_literal(text) text = help_text_make_args_literal(text)
text = help_text_make_single_quotes_literal(text) text = help_text_make_single_quotes_literal(text)
text = help_text_make_title_and_dedent(text) text = help_text_make_title_and_dedent(text)