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

Aaron Carlisle noreply at blender.org
Fri Feb 19 05:44:16 CET 2021 

Revision: 7761
          https://developer.blender.org/rBM7761
Author:   Blendify
Date:     2021-02-19 05:44:16 +0100 (Fri, 19 Feb 2021)
Log Message:
-----------
Merge branch 'blender-2.92-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/about/contribute/guides/markup_guide.rst
    trunk/blender_docs/manual/addons/3d_view/blenderkit.rst
    trunk/blender_docs/manual/addons/camera/camera_rigs.rst
    trunk/blender_docs/manual/addons/import_export/mesh_atomic.rst
    trunk/blender_docs/manual/addons/import_export/paper_model.rst
    trunk/blender_docs/manual/addons/import_export/scene_dxf.rst
    trunk/blender_docs/manual/addons/interface/collection_manager.rst
    trunk/blender_docs/manual/addons/object/bool_tools.rst
    trunk/blender_docs/manual/addons/render/render_freestyle_svg.rst
    trunk/blender_docs/manual/addons/rigging/rigify/basics.rst
    trunk/blender_docs/manual/addons/rigging/rigify/rig_features.rst
    trunk/blender_docs/manual/advanced/app_templates.rst
    trunk/blender_docs/manual/animation/armatures/properties/pose_library.rst
    trunk/blender_docs/manual/animation/constraints/relationship/shrinkwrap.rst
    trunk/blender_docs/manual/animation/drivers/drivers_panel.rst
    trunk/blender_docs/manual/compositing/types/color/alpha_over.rst
    trunk/blender_docs/manual/compositing/types/filter/dilate_erode.rst
    trunk/blender_docs/manual/copyright.rst
    trunk/blender_docs/manual/editors/3dview/display/overlays.rst
    trunk/blender_docs/manual/editors/3dview/display/shading.rst
    trunk/blender_docs/manual/editors/dope_sheet/grease_pencil.rst
    trunk/blender_docs/manual/editors/image/sidebar.rst
    trunk/blender_docs/manual/editors/preferences/input.rst
    trunk/blender_docs/manual/editors/preferences/system.rst
    trunk/blender_docs/manual/files/blend/packed_data.rst
    trunk/blender_docs/manual/files/import_export/alembic.rst
    trunk/blender_docs/manual/files/media/index.rst
    trunk/blender_docs/manual/getting_started/about/history.rst
    trunk/blender_docs/manual/getting_started/installing/macos.rst
    trunk/blender_docs/manual/grease_pencil/materials/grease_pencil_shader.rst
    trunk/blender_docs/manual/grease_pencil/materials/introduction.rst
    trunk/blender_docs/manual/grease_pencil/modes/draw/guides.rst
    trunk/blender_docs/manual/grease_pencil/modes/draw/tools/line.rst
    trunk/blender_docs/manual/grease_pencil/modes/edit/curve_editing.rst
    trunk/blender_docs/manual/grease_pencil/modes/object/trace_image.rst
    trunk/blender_docs/manual/grease_pencil/modifiers/color/hue_saturation.rst
    trunk/blender_docs/manual/grease_pencil/properties/display.rst
    trunk/blender_docs/manual/grease_pencil/properties/layers.rst
    trunk/blender_docs/manual/index.rst
    trunk/blender_docs/manual/interface/annotate_tool.rst
    trunk/blender_docs/manual/interface/keymap/introduction.rst
    trunk/blender_docs/manual/interface/window_system/topbar.rst
    trunk/blender_docs/manual/modeling/curves/properties/geometry.rst
    trunk/blender_docs/manual/modeling/meshes/editing/vertex/extrude_vertices.rst
    trunk/blender_docs/manual/modeling/meshes/mesh_analysis.rst
    trunk/blender_docs/manual/modeling/modifiers/deform/armature.rst
    trunk/blender_docs/manual/modeling/modifiers/deform/hooks.rst
    trunk/blender_docs/manual/modeling/modifiers/deform/laplacian_smooth.rst
    trunk/blender_docs/manual/modeling/modifiers/deform/wave.rst
    trunk/blender_docs/manual/modeling/modifiers/generate/geometry_nodes.rst
    trunk/blender_docs/manual/modeling/modifiers/generate/multiresolution.rst
    trunk/blender_docs/manual/modeling/modifiers/generate/screw.rst
    trunk/blender_docs/manual/modeling/modifiers/generate/solidify.rst
    trunk/blender_docs/manual/modeling/surfaces/primitives.rst
    trunk/blender_docs/manual/movie_clip/tracking/clip/editing/clip.rst
    trunk/blender_docs/manual/movie_clip/tracking/clip/editing/track.rst
    trunk/blender_docs/manual/movie_clip/tracking/clip/toolbar/solve.rst
    trunk/blender_docs/manual/physics/fluid/type/domain/liquid/diffusion.rst
    trunk/blender_docs/manual/physics/fluid/type/domain/settings.rst
    trunk/blender_docs/manual/physics/particles/emitter/physics/newtonian.rst
    trunk/blender_docs/manual/render/cameras.rst
    trunk/blender_docs/manual/render/cycles/baking.rst
    trunk/blender_docs/manual/render/cycles/object_settings/object_data.rst
    trunk/blender_docs/manual/render/freestyle/parameter_editor/line_style/modifiers/geometry/2d_offset.rst
    trunk/blender_docs/manual/render/shader_nodes/converter/shader_to_rgb.rst
    trunk/blender_docs/manual/render/shader_nodes/shader/hair.rst
    trunk/blender_docs/manual/render/shader_nodes/shader/hair_principled.rst
    trunk/blender_docs/manual/render/shader_nodes/shader/specular_bsdf.rst
    trunk/blender_docs/manual/scene_layout/object/editing/cleanup.rst
    trunk/blender_docs/manual/scene_layout/object/properties/display.rst
    trunk/blender_docs/manual/sculpt_paint/brush/falloff.rst
    trunk/blender_docs/manual/sculpt_paint/sculpting/editing/mask.rst
    trunk/blender_docs/manual/sculpt_paint/sculpting/tool_settings/dyntopo.rst
    trunk/blender_docs/manual/sculpt_paint/sculpting/tools/multires_displacement_smear.rst
    trunk/blender_docs/manual/sculpt_paint/sculpting/tools/pose.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-02-19 04:39:58 UTC (rev 7760)
+++ trunk/blender_docs	2021-02-19 04:44:16 UTC (rev 7761)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/branches/blender-2.92-release/blender_docs:7610-7756
\ No newline at end of property
+/branches/blender-2.92-release/blender_docs:7610-7760
\ No newline at end of property
Modified: trunk/blender_docs/manual/about/contribute/guides/markup_guide.rst
===================================================================
--- trunk/blender_docs/manual/about/contribute/guides/markup_guide.rst	2021-02-19 04:39:58 UTC (rev 7760)
+++ trunk/blender_docs/manual/about/contribute/guides/markup_guide.rst	2021-02-19 04:44:16 UTC (rev 7761)
@@ -261,7 +261,6 @@
 
    .. youtube:: ID
 
-
 The ``ID`` is found in the video's URL, e.g:
 
 The ID for ``https://www.youtube.com/watch?v=Ge2Kwy5EGE0`` is ``Ge2Kwy5EGE0``.

Modified: trunk/blender_docs/manual/addons/3d_view/blenderkit.rst
===================================================================
--- trunk/blender_docs/manual/addons/3d_view/blenderkit.rst	2021-02-19 04:39:58 UTC (rev 7760)
+++ trunk/blender_docs/manual/addons/3d_view/blenderkit.rst	2021-02-19 04:44:16 UTC (rev 7761)
@@ -66,7 +66,7 @@
 
 - Drag and dropping an object or material directly into the scene.
 - Click on an item to link/append it to the scene.
-- Open the context menu of a item for further interaction:
+- Open the context menu of an item for further interaction:
 
   Open Authors Website
      Opens the link that the author has specified in a web browser.

Modified: trunk/blender_docs/manual/addons/camera/camera_rigs.rst
===================================================================
--- trunk/blender_docs/manual/addons/camera/camera_rigs.rst	2021-02-19 04:39:58 UTC (rev 7760)
+++ trunk/blender_docs/manual/addons/camera/camera_rigs.rst	2021-02-19 04:44:16 UTC (rev 7761)
@@ -66,7 +66,6 @@
 .. vimeo:: 280727941
    :width: 800px
 
-
 Root Bone
    This is the parent of the entire rig.
    It is the only bone that you should rotate to aim approximately at the action.

Modified: trunk/blender_docs/manual/addons/import_export/mesh_atomic.rst
===================================================================
--- trunk/blender_docs/manual/addons/import_export/mesh_atomic.rst	2021-02-19 04:39:58 UTC (rev 7760)
+++ trunk/blender_docs/manual/addons/import_export/mesh_atomic.rst	2021-02-19 04:44:16 UTC (rev 7761)
@@ -17,7 +17,7 @@
 visualize their atomic structures described in PDB or XYZ files with Blender.
 Thanks to Blender, fancy graphics of molecules, crystal structures, surfaces,
 nanoparticles, clusters and complex atomic arrangements can be obtained.
-Such graphics meet the standards of top-level journals, which have an high impact factor.
+Such graphics meet the standards of top-level journals, which have a high impact factor.
 See `Examples`_ at the end of this page.
 
 .. seealso:: Info about PDB and XYZ

Modified: trunk/blender_docs/manual/addons/import_export/paper_model.rst
===================================================================
--- trunk/blender_docs/manual/addons/import_export/paper_model.rst	2021-02-19 04:39:58 UTC (rev 7760)
+++ trunk/blender_docs/manual/addons/import_export/paper_model.rst	2021-02-19 04:44:16 UTC (rev 7761)
@@ -61,7 +61,7 @@
 Switch to Object Mode and deselect any objects except the one to be exported.
 Then execute *Export Paper Model* and in the File Browser switch the *Textures* selector to *From Materials*.
 
-If you choose to export a SVG file, you get several options how to attach the images.
+If you choose to export an SVG file, you get several options how to attach the images.
 All the options are explained in more detail `Properties`_.
 
 The resulting texture does not depend on any scene settings except for the given material,

Modified: trunk/blender_docs/manual/addons/import_export/scene_dxf.rst
===================================================================
--- trunk/blender_docs/manual/addons/import_export/scene_dxf.rst	2021-02-19 04:39:58 UTC (rev 7760)
+++ trunk/blender_docs/manual/addons/import_export/scene_dxf.rst	2021-02-19 04:44:16 UTC (rev 7761)
@@ -152,8 +152,8 @@
    If Pyproj is available the DXF importer shows a selection of national coordinate systems
    but lets the user also to enter a custom EPSG / SRID code.
    It also stores the SRID as a custom property to the Blender scene.
-   If a scene has already such a SRID property the coordinates are being converted from
-   your DXF file to target coordinate system and therefore you **must** specify a SRID for the DXF file.
+   If a scene has already such an SRID property the coordinates are being converted from
+   your DXF file to target coordinate system and therefore you **must** specify an SRID for the DXF file.
    If no SRID custom property is available the scene SRID is by default the same as the DXF SRID.
 No Pyproj
    In case Pyproj is not available the DXF importer will only use its built-in lat/lon to X/Y converter.

Modified: trunk/blender_docs/manual/addons/interface/collection_manager.rst
===================================================================
--- trunk/blender_docs/manual/addons/interface/collection_manager.rst	2021-02-19 04:39:58 UTC (rev 7760)
+++ trunk/blender_docs/manual/addons/interface/collection_manager.rst	2021-02-19 04:44:16 UTC (rev 7761)
@@ -176,6 +176,7 @@
 You can then interact with these slots by using hotkeys or the widget
 to view or move objects to them.
 
+
 3D Viewport Header Widget
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -198,7 +199,6 @@
    - :kbd:`Alt-LMB` -- Select All QCD Objects.
    - :kbd:`LMB` hold down -- Opens a menu with all Quick View Toggles.
 
-
 QCD Slots
    20 buttons in two rows in groups of five
    where the first row starts with slot 1 and the second with slot 11.
@@ -255,7 +255,7 @@
    - :kbd:`Shift-Alt-0` - :kbd:`Shift-Alt-9` -- Add/remove slot 11-20 (0 is slot 20) to/from view.
    - :kbd:`Shift-=` -- Enable All QCD Slots.
    - :kbd:`=` -- Isolate Selected Objects Collections.
-   - :kbd:`-` -- Disable Selected Objects Collections.
+   - :kbd:`Minus` -- Disable Selected Objects Collections.
    - :kbd:`Shift-Alt-=` -- Disable All Non QCD Slots.
    - :kbd:`Ctrl-Alt-=` -- Disable All Collections.
    - :kbd:`Shift-Ctrl-=` -- Select All QCD Objects.
@@ -269,7 +269,8 @@
 
 .. rubric:: Edit Mode
 
-All Object Mode hotkeys except for Select All QCD Objects and the Disable Objects hotkeys. (Only available if enabled in the preferences.)
+All Object Mode hotkeys except for Select All QCD Objects and the Disable Objects hotkeys.
+(Only available if enabled in the preferences.)
 
 - :kbd:`AccentGrave` -- Mesh Select Mode menu.
 
@@ -281,10 +282,13 @@
 Preferences
 ===========
 
-Disable objects instead of Hiding
-   Replaces the object hiding hotkeys with hotkeys to disable objects instead and adds these options to the :menuselection:`Object --> Show/Hide` menu.
+Disable objects instead of hiding
+   Replaces the object hiding hotkeys with hotkeys to disable objects instead and adds these options to
+   the :menuselection:`Object --> Show/Hide` menu.
 
-   Disabling objects prevents them from being shown again when a collection's exclude checkbox is toggled off and on, and so will preserve the object's visibility when switching QCD slots.
+   Disabling objects prevents them from being shown again
+   when a collection's exclude checkbox is toggled off and on,
+   and so will preserve the object's visibility when switching QCD slots.
 
 QCD
    Enable the QCD system.
@@ -313,24 +317,29 @@
 - Two QCD slots can swap collections if the collections are under the same parent and
   you rename one collection with the name of the other, then undo the rename and redo the rename.
 
+
 Glossary
 ========
 
 General
-   - **Chaining**: Dependent on parents for whether an RTO can be active.
-   - **LMB**: Left Mouse Button.
-   - **QCD**: Quick Content Display.
-   - **QVT**: Quick View Toggles.
-   - **RTO**: Restriction Toggle Option.
+   :Chaining: Dependent on parents for whether an RTO can be active.
+   :LMB: Left Mouse Button.
+   :QCD: Quick Content Display.
+   :QVT: Quick View Toggles.
+   :RTO: Restriction Toggle Option.
 
 RTO Short Forms
-   - **EC**: Exclude Checkbox. (Excludes the collection from the current view layer -- affects both 3d viewport and render -- non-chaining)
-   - **SS**: Selectability. (Disables selection for the collection in all view layers -- affects 3d viewport -- chaining)
-   - **VV**: Visibility. (Hides the collection from the current view layer -- affects 3d viewport -- chaining)
-   - **DV**: Disable Viewports. (Disables the collection in all view layers -- affects 3d viewport -- chaining)
-   - **RR**: Renderability. (Disables the collection from being rendered in all view layers -- affects render -- chaining)
-   - **HH**: Holdout. (Masks out the collection from the view layer -- affects render -- non-chaining)
-   - **IO**: Indirect Only. (Makes the collection only contribute indirectly (shadows/reflections) to the render for the current view layer -- affects render -- non-chaining -- *Cycles only*)
+   :EC: Exclude Checkbox. (Excludes the collection from the current view layer --
+        affects both 3D Viewport and render -- non-chaining.)
+   :SS: Selectability. (Disables selection for the collection in all view layers --
+        affects 3D Viewport -- chaining.)
+   :VV: Visibility. (Hides the collection from the current view layer -- affects 3D Viewport -- chaining.)
+   :DV: Disable Viewports. (Disables the collection in all view layers -- affects 3D Viewport -- chaining.)
+   :RR: Renderability. (Disables the collection from being rendered in all view layers --
+        affects render -- chaining.)
+   :HH: Holdout. (Masks out the collection from the view layer -- affects render -- non-chaining.)
+   :IO: Indirect Only. (Makes the collection only contribute indirectly (shadows/reflections) to the render
+        for the current view layer -- affects render -- non-chaining -- *Cycles only*.)
 
 .. admonition:: Reference
    :class: refbox

Modified: trunk/blender_docs/manual/addons/object/bool_tools.rst

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-docboard-svn mailing list