[Bf-docboard-svn] bf-manual: [8760] trunk/blender_docs/manual: Merge branch 'blender-3.0-release'
Alaska
noreply at blender.org
Sat Dec 4 21:55:34 CET 2021
Revision: 8760
https://developer.blender.org/rBM8760
Author: Alaska
Date: 2021-12-04 21:55:34 +0100 (Sat, 04 Dec 2021)
Log Message:
-----------
Merge branch 'blender-3.0-release'
Modified Paths:
--------------
trunk/blender_docs/manual/animation/armatures/posing/editing/in_betweens.rst
trunk/blender_docs/manual/editors/clip/sidebar.rst
trunk/blender_docs/manual/editors/uv/controls/snapping.rst
trunk/blender_docs/manual/editors/uv/overlays.rst
trunk/blender_docs/manual/files/import_export/alembic.rst
trunk/blender_docs/manual/grease_pencil/modifiers/generate/line_art.rst
trunk/blender_docs/manual/interface/controls/nodes/introduction.rst
trunk/blender_docs/manual/interface/controls/templates/color_ramp.rst
trunk/blender_docs/manual/interface/controls/templates/operator_search.rst
trunk/blender_docs/manual/modeling/meshes/editing/edge/screw.rst
trunk/blender_docs/manual/modeling/meshes/uv/editing.rst
trunk/blender_docs/manual/render/cycles/gpu_rendering.rst
trunk/blender_docs/manual/render/cycles/render_settings/light_paths.rst
trunk/blender_docs/manual/render/materials/line_art.rst
trunk/blender_docs/manual/render/shader_nodes/input/hair_info.rst
trunk/blender_docs/manual/scene_layout/collections/collections.rst
trunk/blender_docs/manual/scene_layout/object/types.rst
trunk/blender_docs/manual/video_editing/preview/sidebar.rst
trunk/blender_docs/manual/video_editing/preview/toolbar/index.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2021-12-04 20:52:28 UTC (rev 8759)
+++ trunk/blender_docs 2021-12-04 20:55:34 UTC (rev 8760)
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-8756
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8543-8759
\ No newline at end of property
Modified: trunk/blender_docs/manual/animation/armatures/posing/editing/in_betweens.rst
===================================================================
--- trunk/blender_docs/manual/animation/armatures/posing/editing/in_betweens.rst 2021-12-04 20:52:28 UTC (rev 8759)
+++ trunk/blender_docs/manual/animation/armatures/posing/editing/in_betweens.rst 2021-12-04 20:55:34 UTC (rev 8760)
@@ -111,5 +111,5 @@
:Menu: :menuselection:`Pose --> In-Betweens --> Blend to Neighbor`
:Shortcut: :kbd:`Shift-Alt-E`
-Transitions the current pose with the neighbouring keyframes in the timeline.
+Transitions the current pose with the neighboring keyframes in the timeline.
In order for this operator to work, there must be a keyframe before and after the current frame.
Modified: trunk/blender_docs/manual/editors/clip/sidebar.rst
===================================================================
--- trunk/blender_docs/manual/editors/clip/sidebar.rst 2021-12-04 20:52:28 UTC (rev 8759)
+++ trunk/blender_docs/manual/editors/clip/sidebar.rst 2021-12-04 20:55:34 UTC (rev 8760)
@@ -79,14 +79,14 @@
2D Cursor
---------
-The 2D cursor is the dashed grey crosshair that is shown in the image preview region.
-It can be used by setting the Pivot Point to 2D Cursor to transform all points
-in relation to the location of thr 2D Cursor.
+The 2D cursor is the dashed gray cross-hair that is shown in the main region.
+It can be used by setting the pivot point to *2D Cursor* to transform all points
+in relation to the location of the 2D cursor.
.. _bpy.types.SpaceClipEditor.cursor_location:
Location X, Y
- The location of the 2D Cursor relative to the bottom left of the preview region.
- The edge of the image with be 1 away, so (0.5, 0.5) will be the the center of the image.
+ The location of the 2D cursor is relative to the bottom left of the main region.
+ The edge of the image will be 0.5 away, so (0.5, 0.5) will be the top right corner.
- The 2D Cursor's location can also be set with :kbd:`Shift-RMB`.
+ The 2D cursor's location can also be set with :kbd:`Shift-RMB`.
Modified: trunk/blender_docs/manual/editors/uv/controls/snapping.rst
===================================================================
--- trunk/blender_docs/manual/editors/uv/controls/snapping.rst 2021-12-04 20:52:28 UTC (rev 8759)
+++ trunk/blender_docs/manual/editors/uv/controls/snapping.rst 2021-12-04 20:55:34 UTC (rev 8760)
@@ -15,7 +15,7 @@
Increment
Snap elements along points on a fixed scale.
- These pointes are defined by the grid's intersection points
+ These points are defined by the intersection points of the grid
and the scale of the increments depending on zoom level,
unless using :ref:`bpy.types.SpaceUVEditor.use_custom_grid`.
@@ -43,7 +43,7 @@
Snap to the visual grid, instead of snapping in increments relative to the current location.
Target
- See :ref:`3D Viewport Snapping <bpy.types.ToolSettings.snap_target>` for more information.
+ See :ref:`3D Viewport Snapping <bpy.types.ToolSettings.snap_target>` for more information.
Affect
Modified: trunk/blender_docs/manual/editors/uv/overlays.rst
===================================================================
--- trunk/blender_docs/manual/editors/uv/overlays.rst 2021-12-04 20:52:28 UTC (rev 8759)
+++ trunk/blender_docs/manual/editors/uv/overlays.rst 2021-12-04 20:55:34 UTC (rev 8760)
@@ -3,7 +3,7 @@
Overlays
********
-The Overlays pop-over configures the overlays that are displayed on top of images.
+The Overlays popover configures the overlays that are displayed on top of images.
In the header, there is a button to turn off all overlays for the UV Editor.
This option also toggles the visibility of :doc:`/modeling/meshes/uv/workflows/udims` tile information.
The options that are visible in the pop-over depend on the UV Editor mode.
@@ -10,7 +10,7 @@
.. seealso::
- Addition :doc:`View Properties </editors/uv/sidebar>` can be configured in the sidebar.
+ Addition :doc:`View Properties </editors/uv/sidebar>` can be configured in the Sidebar.
UV Editing
Modified: trunk/blender_docs/manual/files/import_export/alembic.rst
===================================================================
--- trunk/blender_docs/manual/files/import_export/alembic.rst 2021-12-04 20:52:28 UTC (rev 8759)
+++ trunk/blender_docs/manual/files/import_export/alembic.rst 2021-12-04 20:55:34 UTC (rev 8760)
@@ -136,7 +136,7 @@
Pack UV Islands
Generates an optimized UV layout with non-overlapping islands
that tries to efficiently fill the :term:`Texture Space`.
- See the :ref:`pack islands operator <bpy.ops.uv.pack_islands>`
+ See the :ref:`Pack Islands operator <bpy.ops.uv.pack_islands>`
that works with the same principle for more information.
Normals
Modified: trunk/blender_docs/manual/grease_pencil/modifiers/generate/line_art.rst
===================================================================
--- trunk/blender_docs/manual/grease_pencil/modifiers/generate/line_art.rst 2021-12-04 20:52:28 UTC (rev 8759)
+++ trunk/blender_docs/manual/grease_pencil/modifiers/generate/line_art.rst 2021-12-04 20:55:34 UTC (rev 8760)
@@ -27,7 +27,7 @@
Use Cache
Optimize rendering by using cached scene data from the first line art modifier in the stack.
- This option has the disadvantage of certain settings becoming unavailable
+ This option has the disadvantage of certain settings becoming unavailable.
This option only available when you have more than one Line Art modifier
is the same modifier stack and the modifier is not the first Line Art modifier in the stack.
@@ -244,7 +244,7 @@
Loose Edges
Allow floating Edges that do not form a face to be chained together.
-
+
Loose as Contour
Edges that do not form a face will be classified as contour lines.
@@ -309,7 +309,7 @@
Depth Offset
Move strokes slightly towards the camera to avoid clipping while preserve depth for the viewport.
- This option will be grayed out unless :ref:`Show in Front <bpy.types.Object.show_in_front>` is disabled.
+ This option is unavailable unless :ref:`Show in Front <bpy.types.Object.show_in_front>` is disabled.
.. _bpy.types.LineartGpencilModifier.use_offset_towards_custom_camera:
Modified: trunk/blender_docs/manual/interface/controls/nodes/introduction.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/nodes/introduction.rst 2021-12-04 20:52:28 UTC (rev 8759)
+++ trunk/blender_docs/manual/interface/controls/nodes/introduction.rst 2021-12-04 20:55:34 UTC (rev 8760)
@@ -74,12 +74,12 @@
^^^^^^^^
Overlays are information that is displayed on top of the nodes and node trees.
-There is a toggle to show or hide all overlays for the node editor next to the overlay pop over.
+There is a toggle to show or hide all overlays for the node editor next to the overlay popover.
.. _bpy.types.SpaceNodeOverlay.show_wire_color:
Wire Colors
- Color node links based on their connected sockets
+ Color node links based on their connected sockets.
.. _bpy.types.SpaceNodeEditor.show_annotation:
Modified: trunk/blender_docs/manual/interface/controls/templates/color_ramp.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/templates/color_ramp.rst 2021-12-04 20:52:28 UTC (rev 8759)
+++ trunk/blender_docs/manual/interface/controls/templates/color_ramp.rst 2021-12-04 20:55:34 UTC (rev 8760)
@@ -57,15 +57,15 @@
.. _bpy.types.ColorRamp.interpolation:
Color Interpolation
- Enables the user to choose the types of calculations for the color interpolation for each color stop.
+ Enables you to choose the types of calculations for the color interpolation for each color stop.
RGB
- :B-Spline: Uses a *B-Spline* Interpolation for the color stops.
- :Cardinal: Uses a *Cardinal* Interpolation for the color stops.
- :Linear: Uses a *Linear* Interpolation for the color stops.
- :Ease: Uses an *Ease* Interpolation for the color stops.
- :Constant: Uses a *Constant* Interpolation for the color stops.
-
+ :B-Spline: Uses a B-spline interpolation for the color stops.
+ :Cardinal: Uses a cardinal interpolation for the color stops.
+ :Linear: Uses a linear interpolation for the color stops.
+ :Ease: Uses an ease interpolation for the color stops.
+ :Constant: Uses a constant interpolation for the color stops.
+
HSV/HSL
:Clockwise: Clockwise interpolation around the HSV/HSL wheel.
:Counter-Clockwise: Counterclockwise around the HSV/HSL wheel.
Modified: trunk/blender_docs/manual/interface/controls/templates/operator_search.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/templates/operator_search.rst 2021-12-04 20:52:28 UTC (rev 8759)
+++ trunk/blender_docs/manual/interface/controls/templates/operator_search.rst 2021-12-04 20:55:34 UTC (rev 8760)
@@ -16,7 +16,7 @@
:Shortcut: :kbd:`F3`
The Menu Search pop-up searches Blender's interface for a desired operator and allows you to execute that operator.
-It returns a list of matches and shows which menu the operator was found in.
+It displays a list of matches and shows which menu the operator was found in.
Start typing the name of the operator you want to refine the list.
When the list is sufficiently narrowed, :kbd:`LMB` on the desired operator or
navigate with :kbd:`Down` and :kbd:`Up`, run the selected operator by pressing :kbd:`Return`.
Modified: trunk/blender_docs/manual/modeling/meshes/editing/edge/screw.rst
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-docboard-svn
mailing list