[Bf-docboard-svn] bf-manual: [8610] trunk/blender_docs/manual: Merge branch 'blender-3.0-release'

Aaron Carlisle noreply at blender.org
Tue Nov 9 19:42:06 CET 2021


Revision: 8610
          https://developer.blender.org/rBM8610
Author:   Blendify
Date:     2021-11-09 19:42:06 +0100 (Tue, 09 Nov 2021)
Log Message:
-----------
Merge branch 'blender-3.0-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/animation/armatures/posing/selecting.rst
    trunk/blender_docs/manual/editors/3dview/display/overlays.rst
    trunk/blender_docs/manual/editors/3dview/navigate/navigation.rst
    trunk/blender_docs/manual/editors/3dview/selecting.rst
    trunk/blender_docs/manual/editors/dope_sheet/introduction.rst
    trunk/blender_docs/manual/editors/preferences/input.rst
    trunk/blender_docs/manual/editors/video_sequencer/preview/index.rst
    trunk/blender_docs/manual/interface/controls/nodes/selecting.rst
    trunk/blender_docs/manual/interface/keymap/blender_default.rst
    trunk/blender_docs/manual/modeling/curves/selecting.rst
    trunk/blender_docs/manual/modeling/meshes/selecting/introduction.rst
    trunk/blender_docs/manual/modeling/surfaces/selecting.rst
    trunk/blender_docs/manual/movie_clip/masking/selecting.rst
    trunk/blender_docs/manual/movie_clip/tracking/clip/selecting.rst
    trunk/blender_docs/manual/physics/particles/mode.rst
    trunk/blender_docs/manual/render/layers/passes.rst
    trunk/blender_docs/manual/scene_layout/object/editing/relations/make_single_user.rst
    trunk/blender_docs/manual/scene_layout/object/selecting.rst
    trunk/blender_docs/manual/video_editing/preview/display_mode.rst
    trunk/blender_docs/manual/video_editing/preview/introduction.rst

Added Paths:
-----------
    trunk/blender_docs/manual/editors/video_sequencer/preview/controls/
    trunk/blender_docs/manual/editors/video_sequencer/preview/display/
    trunk/blender_docs/manual/editors/video_sequencer/preview/introduction.rst

Property Changed:
----------------
    trunk/blender_docs/

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-11-09 18:35:28 UTC (rev 8609)
+++ trunk/blender_docs	2021-11-09 18:42:06 UTC (rev 8610)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
 /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-8597
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8543-8609
\ No newline at end of property
Modified: trunk/blender_docs/manual/animation/armatures/posing/selecting.rst
===================================================================
--- trunk/blender_docs/manual/animation/armatures/posing/selecting.rst	2021-11-09 18:35:28 UTC (rev 8609)
+++ trunk/blender_docs/manual/animation/armatures/posing/selecting.rst	2021-11-09 18:42:06 UTC (rev 8610)
@@ -9,6 +9,41 @@
 You can only select *whole bones* in *Pose Mode*, not roots/tips...
 
 
+Box Select
+==========
+
+.. reference::
+
+   :Mode:      All Modes
+   :Menu:      :menuselection:`Select --> Box Select`
+   :Shortcut:  :kbd:`B`
+
+Interactive :ref:`box selection <tool-select-box>`.
+
+
+Circle Select
+=============
+
+.. reference::
+
+   :Mode:      All Modes
+   :Menu:      :menuselection:`Select --> Circle Select`
+   :Shortcut:  :kbd:`C`
+
+Interactive :ref:`circle selection <tool-select-circle>`.
+
+
+Lasso Select
+============
+
+.. reference::
+
+   :Mode:      All modes
+   :Menu:      :menuselection:`Select --> Lasso Select`
+   :Shortcut:  :kbd:`Ctrl-Alt-LMB`
+
+See :ref:`tool-select-lasso`.
+
 .. _bpy.ops.pose.select_mirror:
 
 Select Mirror

Modified: trunk/blender_docs/manual/editors/3dview/display/overlays.rst
===================================================================
--- trunk/blender_docs/manual/editors/3dview/display/overlays.rst	2021-11-09 18:35:28 UTC (rev 8609)
+++ trunk/blender_docs/manual/editors/3dview/display/overlays.rst	2021-11-09 18:42:06 UTC (rev 8610)
@@ -239,7 +239,12 @@
 Size
    The size to show the selected normals.
 
+   .. _bpy.types.View3DOverlay.use_normals_constant_screen_size:
 
+   Constant Screen Size Normals
+      Keep size of normals constant in relation to the zoom level.
+
+
 Developer
 ---------
 

Modified: trunk/blender_docs/manual/editors/3dview/navigate/navigation.rst
===================================================================
--- trunk/blender_docs/manual/editors/3dview/navigate/navigation.rst	2021-11-09 18:35:28 UTC (rev 8609)
+++ trunk/blender_docs/manual/editors/3dview/navigate/navigation.rst	2021-11-09 18:42:06 UTC (rev 8610)
@@ -25,8 +25,9 @@
 to rotate the scene around the global Z axis from your current point of view.
 Finally :kbd:`Numpad9` switches to the opposite side of the view.
 
-Or if the *Emulate 3 button mouse* option is select in the Preferences
-you can press and hold :kbd:`Alt` while dragging :kbd:`LMB` in the viewport's area.
+Or if the :ref:`Emulate 3 Button Mouse <preferences-input-emulate-mouse>`
+option is select in the Preferences you can press and hold :kbd:`Alt`
+while dragging :kbd:`LMB` in the viewport's area.
 
 .. note:: Hotkeys
 

Modified: trunk/blender_docs/manual/editors/3dview/selecting.rst
===================================================================
--- trunk/blender_docs/manual/editors/3dview/selecting.rst	2021-11-09 18:35:28 UTC (rev 8609)
+++ trunk/blender_docs/manual/editors/3dview/selecting.rst	2021-11-09 18:42:06 UTC (rev 8610)
@@ -47,3 +47,9 @@
 =========
 
 :doc:`Pose Mode </animation/armatures/posing/selecting>`
+
+
+Particle Edit Mode
+==================
+
+:ref:`Particle Edit Mode <particle-edit-selecting>`.

Modified: trunk/blender_docs/manual/editors/dope_sheet/introduction.rst
===================================================================
--- trunk/blender_docs/manual/editors/dope_sheet/introduction.rst	2021-11-09 18:35:28 UTC (rev 8609)
+++ trunk/blender_docs/manual/editors/dope_sheet/introduction.rst	2021-11-09 18:42:06 UTC (rev 8610)
@@ -105,7 +105,8 @@
 Box Selecting
    Click and drag to box select multiple keyframes at once.
    You can hold :kbd:`Shift` to extend or :kbd:`Ctrl` to subtract from the current selection.
-
+Select Lasso
+   See :ref:`tool-select-lasso`.
 Select/Deselect All
    - To select all keys, press :kbd:`A`.
    - To deselect all keys, press :kbd:`Alt-A`.

Modified: trunk/blender_docs/manual/editors/preferences/input.rst
===================================================================
--- trunk/blender_docs/manual/editors/preferences/input.rst	2021-11-09 18:35:28 UTC (rev 8609)
+++ trunk/blender_docs/manual/editors/preferences/input.rst	2021-11-09 18:42:06 UTC (rev 8610)
@@ -25,6 +25,8 @@
 Mouse
 =====
 
+.. _preferences-input-emulate-mouse:
+
 Emulate 3 Button Mouse
    Blender can be configured to work with pointing devices which do not have an :kbd:`MMB`.
    The functionality of the three mouse buttons by holding :kbd:`Alt-LMB`.

Modified: trunk/blender_docs/manual/editors/video_sequencer/preview/index.rst
===================================================================
--- trunk/blender_docs/manual/editors/video_sequencer/preview/index.rst	2021-11-09 18:35:28 UTC (rev 8609)
+++ trunk/blender_docs/manual/editors/video_sequencer/preview/index.rst	2021-11-09 18:42:06 UTC (rev 8610)
@@ -1,27 +1,11 @@
 
-*******
-Preview
-*******
+###########
+  Preview
+###########
 
-The Preview contains two regions (see figure 1), the Header is shown
-in a yellow outline with the *Preview* (red outline) underneath.
-This Preview has no fixed dimensions; you can zoom in or move indefinitely.
-However, in figure 1 you see a checkered area (green outline).
-This preview has the aspect ratio of the Project Dimensions; e.g. 1920 x 1080 pixels in figure 1.
-But, because the source strip could be scaled in a different resolution,
-the yellow outline shows the area that the source strip occupies.
-As you can see, the Open movie "Spring" has a different resolution than
-the project and letterboxes are added at the top and bottom of the image.
+.. toctree::
+   :maxdepth: 2
 
-In contrast with the :doc:`Sequencer View </editors/video_sequencer/sequencer/index>` example,
-both the Toolbar and Sidebar are expanded in figure 1.
-The gizmos however are unique for the Preview.
-
-.. figure:: /images/editors_vse_type.svg
-   :alt: Preview window
-
-   Figure 1: Preview window of VSE
-
-Sequencer preview is used to display result of rendering Sequencer timeline.
-This can be further configured to display output from certain channel, overlay or image analyzer (scope).
-You can adjust the view by zooming in with :kbd:`NumpadPlus` and zoom out with :kbd:`NumpadMinus`.
+   introduction.rst
+   controls/index.rst
+   display/index.rst

Copied: trunk/blender_docs/manual/editors/video_sequencer/preview/introduction.rst (from rev 8609, branches/blender-3.0-release/blender_docs/manual/editors/video_sequencer/preview/introduction.rst)
===================================================================
--- trunk/blender_docs/manual/editors/video_sequencer/preview/introduction.rst	                        (rev 0)
+++ trunk/blender_docs/manual/editors/video_sequencer/preview/introduction.rst	2021-11-09 18:42:06 UTC (rev 8610)
@@ -0,0 +1,27 @@
+
+************
+Introduction
+************
+
+The Preview contains two regions (see figure 1), the Header is shown
+in a yellow outline with the *Preview* (red outline) underneath.
+This Preview has no fixed dimensions; you can zoom in or move indefinitely.
+However, in figure 1 you see a checkered area (green outline).
+This preview has the aspect ratio of the Project Dimensions; e.g. 1920 x 1080 pixels in figure 1.
+But, because the source strip could be scaled in a different resolution,
+the yellow outline shows the area that the source strip occupies.
+As you can see, the Open movie "Spring" has a different resolution than
+the project and letterboxes are added at the top and bottom of the image.
+
+In contrast with the :doc:`Sequencer View </editors/video_sequencer/sequencer/index>` example,
+both the Toolbar and Sidebar are expanded in figure 1.
+The gizmos however are unique for the Preview.
+
+.. figure:: /images/editors_vse_type.svg
+   :alt: Preview window
+
+   Figure 1: Preview window of VSE
+
+Sequencer preview is used to display result of rendering Sequencer timeline.
+This can be further configured to display output from certain channel, overlay or image analyzer (scope).
+You can adjust the view by zooming in with :kbd:`NumpadPlus` and zoom out with :kbd:`NumpadMinus`.

Modified: trunk/blender_docs/manual/interface/controls/nodes/selecting.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/nodes/selecting.rst	2021-11-09 18:35:28 UTC (rev 8609)
+++ trunk/blender_docs/manual/interface/controls/nodes/selecting.rst	2021-11-09 18:42:06 UTC (rev 8610)
@@ -8,7 +8,8 @@
    Alternatively, :kbd:`B` starts the bounding box selection process as well.
 Lasso Select
    :kbd:`Ctrl-Alt-LMB` click and drag starts a lasso selection.
-
+Lasso Select
+   See :ref:`tool-select-lasso`.
 Select All :kbd:`A`
    Select all nodes.
 Deselect All :kbd:`Alt-A`

Modified: trunk/blender_docs/manual/interface/keymap/blender_default.rst
===================================================================
--- trunk/blender_docs/manual/interface/keymap/blender_default.rst	2021-11-09 18:35:28 UTC (rev 8609)
+++ trunk/blender_docs/manual/interface/keymap/blender_default.rst	2021-11-09 18:42:06 UTC (rev 8610)
@@ -168,6 +168,7 @@
 
 Activate Gizmo Event
    The activation event for gizmos that support drag motion.
+   This option is only available when Left click *Select with Mouse Button* is chosen.
 
    :Press:
       Allows immediate activation, preventing click events being passed to the tool.
@@ -174,13 +175,37 @@
    :Drag:
       Allows click events to pass through to the tool, adding a small delay.
 
-Select All Toggles
-   Causes selection shortcut :kbd:`A` to deselect all when any selection exists.
+Right Mouse Select Action
+   The default action for the right mouse button.
+   This option is only available when Right click *Select with Mouse Button* is chosen.
 
+   :Select & Tweak: Right mouse always tweaks the selected item.
+   :Selection Tool: Right mouse uses the selection tool.

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-docboard-svn mailing list