Fix #107265: Compositor: output node remove note that z-depth can be saved #104457

Closed
Habib Gahbiche wants to merge 53 commits from zazizizou/blender-manual:com-outputfile into blender-v3.6-release

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
4 changed files with 17 additions and 4 deletions
Showing only changes of commit 457172f3e4 - Show all commits

View File

@ -23,9 +23,10 @@ Checking
- check_syntax to check the syntax of all .rst files. - check_syntax to check the syntax of all .rst files.
- check_spelling to check spelling for text in RST files. - check_spelling to check spelling for text in RST files.
Python Scripts Utilities
-------------- ---------
- update to update the repository to the most recent version.
- format_py to auto-format Python scripts. - format_py to auto-format Python scripts.
endef endef
@ -123,6 +124,9 @@ report_po_progress:
@python3 tools_report/report_translation_progress.py --quiet \ @python3 tools_report/report_translation_progress.py --quiet \
`find locale/ -maxdepth 1 -mindepth 1 -type d -not -iwholename '*.git*' -printf 'locale/%f\n' | sort` `find locale/ -maxdepth 1 -mindepth 1 -type d -not -iwholename '*.git*' -printf 'locale/%f\n' | sort`
update:
@git pull --rebase
format_py: format_py:
@autopep8 --in-place --recursive . @autopep8 --in-place --recursive .

View File

@ -63,6 +63,11 @@ if "%1" == "help" (
echo - check_structure to check the structure of all .rst files echo - check_structure to check the structure of all .rst files
echo - check_syntax to check the syntax of all .rst files echo - check_syntax to check the syntax of all .rst files
echo - check_spelling to check spelling for text in RST files echo - check_spelling to check spelling for text in RST files
echo.
echo Utilities
echo ---------
echo.
echo - update to update the repository to the most recent version.
goto EOF goto EOF
) )
@ -109,6 +114,10 @@ if "%1" == "check_structure" (
python tools_rst\rst_check_images.py python tools_rst\rst_check_images.py
goto EOF goto EOF
if "%1" == "update" (
git pull --rebase
goto EOF
) else ( ) else (
%SPHINXBUILD% -M %1 "%SOURCEDIR%" "%BUILDDIR%" %SPHINXOPTS% %O% %SPHINXBUILD% -M %1 "%SOURCEDIR%" "%BUILDDIR%" %SPHINXOPTS% %O%
goto EOF goto EOF

View File

@ -18,7 +18,7 @@ Update
Firstly, make sure that your local copy of the manual is up to date with the online repository using:: Firstly, make sure that your local copy of the manual is up to date with the online repository using::
git pull --rebase make update
Writing Writing

View File

@ -20,7 +20,7 @@ If you leave out ``-m "message"``, you will be prompted to type the message in a
You should make sure you are always on the latest revision before committing. You should make sure you are always on the latest revision before committing.
You may not be able to commit directly if there are conflicting changes in the latest revision. You may not be able to commit directly if there are conflicting changes in the latest revision.
To avoid this run ``git pull --rebase`` before committing. To avoid this update your local repository before committing (run ``make update``).
.. seealso:: .. seealso::