[Bf-docboard-svn] bf-manual: [9069] trunk/blender_docs/manual/addons/interface/amaranth.rst: Merge branch 'blender-3.1-release'
Aaron Carlisle
noreply at blender.org
Wed Mar 2 03:22:20 CET 2022
Revision: 9069
https://developer.blender.org/rBM9069
Author: Blendify
Date: 2022-03-02 03:22:20 +0100 (Wed, 02 Mar 2022)
Log Message:
-----------
Merge branch 'blender-3.1-release'
Modified Paths:
--------------
trunk/blender_docs/manual/about/contribute/patch_commit.rst
trunk/blender_docs/manual/addons/interface/amaranth.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2022-03-02 02:21:59 UTC (rev 9068)
+++ trunk/blender_docs 2022-03-02 02:22:20 UTC (rev 9069)
Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/blender-2.92-release/blender_docs:7610-7921
/branches/blender-2.93-release/blender_docs:7959-8113
/branches/blender-3.0-release/blender_docs:8543-9034
-/branches/blender-3.1-release/blender_docs:8904-9065
\ No newline at end of property
+/branches/blender-3.1-release/blender_docs:8904-9068
\ No newline at end of property
Modified: trunk/blender_docs/manual/about/contribute/patch_commit.rst
===================================================================
--- trunk/blender_docs/manual/about/contribute/patch_commit.rst 2022-03-02 02:21:59 UTC (rev 9068)
+++ trunk/blender_docs/manual/about/contribute/patch_commit.rst 2022-03-02 02:22:20 UTC (rev 9069)
@@ -46,7 +46,12 @@
Once you get accustomed to making changes and no longer need feedback,
we cut out the middle man and give you direct access to edit the manual.
+.. seealso::
+ See :doc:`/about/contribute/release_cycle` for documentation on how to make
+ commits to a specific release branch and how to create merge commits.
+
+
Commit Directly
===============
@@ -65,6 +70,10 @@
Then you will be asked for your username and password
(from ``developer.blender.org``) before the change is committed.
+.. note::
+
+ Make sure to use your username (case sensitive) and not your email.
+
Your modified files are uploaded to the central repository for others to work with and continue collaborating.
Commits are tracked in the repositories `Diffusion <https://developer.blender.org/diffusion/BM/>`__.
Soon after your changes become visible in the online manual.
@@ -89,4 +98,4 @@
when you are making general cleanups or fixes respectively.
Writing good commit messages helps administrators keep track of
-changes made and ensures all new features are properly documented.
+changes made and ensures all new features are properly documented.
Modified: trunk/blender_docs/manual/addons/interface/amaranth.rst
===================================================================
--- trunk/blender_docs/manual/addons/interface/amaranth.rst 2022-03-02 02:21:59 UTC (rev 9068)
+++ trunk/blender_docs/manual/addons/interface/amaranth.rst 2022-03-02 02:22:20 UTC (rev 9069)
@@ -56,7 +56,8 @@
Wireframe Toggle
----------------
-Enable or disable wireframe display on mesh objects. It even works on linked objects/scenes too, where this option is not accessible.
+Enable or disable wireframe display on mesh objects.
+It even works on linked objects/scenes too, where this option is not accessible.
"Display" will enable the wireframe, while "Clear" will disable it.
@@ -117,7 +118,8 @@
A quick way to view an image assigned to an Image node.
-Usage: Double-click an Image Node in the Nodes Editor (Compositor or Cycles), there must be at least 1 image editor available.
+Usage: Double-click an Image Node in the Nodes Editor (Compositor or Cycles),
+there must be at least 1 image editor available.
Node Templates: Vignette
@@ -142,9 +144,11 @@
Object / Material Indices Panel
-------------------------------
-When working with ID Masks in the Nodes Editor, it's hard to follow track of which Objects/Materials have which Pass Index.
+When working with ID Masks in the Nodes Editor,
+it's hard to follow track of which Objects/Materials have which Pass Index.
-This adds a panel on the sidebar when an ID Mask node is selected. The active object is highlighted between [square brackets]
+This adds a panel on the sidebar when an ID Mask node is selected.
+The active object is highlighted between [square brackets]
Usage: On the Nodes Editor's sidebar, when an ID Mask node is selected.
@@ -194,10 +198,12 @@
Current Frame Slider
--------------------
-Currently the only way to change the current frame is to have a Timeline editor open, but sometimes you don't have one,
-or you're fullscreen. This feature adds the `Current Frame` slider to the context menu.
+Currently the only way to change the current frame is to have a Timeline editor open,
+but sometimes you don't have one, or you're fullscreen.
+This feature adds the `Current Frame` slider to the context menu.
-Usage: Find it in the :kbd:`RMB` (context or :kbd:`W` in right-click select keymap) menu in Object mode or Pose mode,
+Usage: Find it in the :kbd:`RMB` (context or :kbd:`W`
+in right-click select keymap) menu in Object mode or Pose mode,
click-drag sideways or click in the middle to set the frame manually.
@@ -272,7 +278,8 @@
The "List Empty Material Slots" button will print a list of all the objects that have empty material slots.
-If the objects are linked, it will show a list of the libraries paths, click on them to open a new Blender instance with that library.
+If the objects are linked, it will show a list of the libraries paths,
+click on them to open a new Blender instance with that library.
Usage: Find it in the Scene Debug panel, on Scene Properties.
@@ -353,7 +360,8 @@
Save your Color Management options as presets, for easy re-use.
-Store most options in the Color Management panel, such as the look and color settings. Storing curve points is not supported yet.
+Store most options in the Color Management panel, such as the look and color settings.
+Storing curve points is not supported yet.
Usage: Find the presets selector on the top of the **Color Management** panel under Render Properties.
@@ -361,7 +369,8 @@
Instancing: Show Path of Libraries
----------------------------------
-Display the library path of a linked Collection Instance. Click on the path to open that .blend file in a new Blender instance.
+Display the library path of a linked Collection Instance.
+Click on the path to open that .blend file in a new Blender instance.
Usage: Find it in the **Instancing** panel, when a Collection Instance (linked) is active.
@@ -369,7 +378,8 @@
Sequencer: Display Image File Name
----------------------------------
-When seeking through an image sequence, display the active strips' file name for the current frame, and its playhead (in square brackets).
+When seeking through an image sequence, display the active strips'
+file name for the current frame, and its playhead (in square brackets).
Usage: Find it in the VSE header.
@@ -377,7 +387,8 @@
EXR Render: Warn when Z not connected
-------------------------------------
-Display a warning label when exporting EXR, with Z Buffer enabled, but the Z input in the **Composite** node is not connected.
+Display a warning label when exporting EXR, with Z Buffer enabled,
+but the Z input in the **Composite** node is not connected.
Usage: Find it in the Output panel, Render properties.
More information about the Bf-docboard-svn
mailing list