From 59afa895b6bfc4fc1aad0a4ced6b7c2ef7517353 Mon Sep 17 00:00:00 2001 From: Germano Cavalcante <=> Date: Mon, 25 Mar 2024 10:27:12 -0300 Subject: [PATCH 1/3] Update snap menu documentation The names 'Snap With' and 'Snap To' have been renamed to 'Snap Base' and 'Snap Target'. Documentation needs to reflect this. The image has been updated. And documentation has also been added for the "Rotation Increment" (Ref [1]). [0]: https://projects.blender.org/blender/blender/commit/f66cb1e635 [1]: https://projects.blender.org/blender/blender/commit/060174cf14 --- manual/editors/3dview/controls/snapping.rst | 14 ++++++++++---- ...itors_3dview_controls_snapping_element-menu.png | 4 ++-- manual/modeling/transform/modal_map.rst | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/manual/editors/3dview/controls/snapping.rst b/manual/editors/3dview/controls/snapping.rst index 9ae96ebe8..b4442d755 100644 --- a/manual/editors/3dview/controls/snapping.rst +++ b/manual/editors/3dview/controls/snapping.rst @@ -33,17 +33,16 @@ or more temporarily by holding :kbd:`Ctrl`. .. _bpy.types.ToolSettings.snap_target: -Snap With +Snap Base ========= .. reference:: :Mode: Object, Edit, and Pose Mode - :Header: :menuselection:`Snapping --> Snap with` + :Header: :menuselection:`Snapping --> Snap Base` :Shortcut: :kbd:`Shift-Ctrl-Tab` -Determines what part of the selection will coincide with the target. -(The rest of the selection will follow along.) +Determines which point in the geometry is the snap base that will snap to the target. Active Snaps using the origin (in Object Mode) or center (in Edit Mode) of the active element. @@ -225,3 +224,10 @@ Affect Specifies which transformations are affected by snapping. By default, snapping only happens while moving something, but you can also enable it for rotating and scaling. + +Rotation Increment +====== + +Angle used in incremental snapping for the rotation operator. +The second value is the `Rotation Precision Increment`, used for finer transformations +and activated by default with the `Shift` key. diff --git a/manual/images/editors_3dview_controls_snapping_element-menu.png b/manual/images/editors_3dview_controls_snapping_element-menu.png index 69f2e4471..6eb9a9da9 100644 --- a/manual/images/editors_3dview_controls_snapping_element-menu.png +++ b/manual/images/editors_3dview_controls_snapping_element-menu.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86521505a77223f683f0bbaf5c1beea0ab31fce1b0a047bc356e9b299696c174 -size 31482 +oid sha256:03e2aa8ab8b5f381b3a78dc067f6622378229a7187f248b880bcac65345bdae7 +size 28787 diff --git a/manual/modeling/transform/modal_map.rst b/manual/modeling/transform/modal_map.rst index 51db96c35..136f4698b 100644 --- a/manual/modeling/transform/modal_map.rst +++ b/manual/modeling/transform/modal_map.rst @@ -41,7 +41,7 @@ The default hotkey in this case is :kbd:`Ctrl`. Set Snap Base ------------- -Snap Base is taken automatically depending on the :ref:`Snap With ` options. +Snap Base is taken automatically depending on the :ref:`Snap Base ` options. However, this automatic snap detection point of origin is not always what the user desires. Therefore, transform operations have a utility to set a new snap origin point during the transformation. By default the hotkey is :kbd:`B`. -- 2.30.2 From dd87c8931d529f3d713bccaadbc03eb850d37720 Mon Sep 17 00:00:00 2001 From: Germano Cavalcante <=> Date: Thu, 28 Mar 2024 10:01:29 -0300 Subject: [PATCH 2/3] Add Grid Info | Remove Absolute Grid Snap | Update Image | Rename Snap To --- manual/editors/3dview/controls/snapping.rst | 24 +++++++------------ manual/editors/uv/controls/snapping.rst | 23 ++++++++++-------- ..._3dview_controls_snapping_element-menu.png | 4 ++-- manual/modeling/transform/modal_map.rst | 7 ++++++ 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/manual/editors/3dview/controls/snapping.rst b/manual/editors/3dview/controls/snapping.rst index b4442d755..a361c2e96 100644 --- a/manual/editors/3dview/controls/snapping.rst +++ b/manual/editors/3dview/controls/snapping.rst @@ -74,13 +74,13 @@ Closest .. _bpy.types.ToolSettings.snap_elements_base: -Snap To -======= +Snap Target +=========== .. reference:: :Mode: Object, Edit, and Pose Mode - :Header: :menuselection:`Snapping --> Snap To` + :Header: :menuselection:`Snapping --> Snap Target` :Shortcut: :kbd:`Shift-Ctrl-Tab` Determines the target which the selection will be snapped to. @@ -94,9 +94,8 @@ Increment but an imaginary grid with the same resolution that starts at the selection's original location. In other words, it lets you move the selection in "increments" of the grid cell size. - - If you want to snap to the viewport grid instead, you can enable *Absolute Grid Snap* - (see below). +Grid + Snaps to the grid that's displayed in the viewport. Vertex Snaps to the vertex that's closest to the mouse cursor. Edge @@ -122,13 +121,13 @@ Edge Perpendicular .. _bpy.types.ToolSettings.snap_elements_individual: -Snap Individual Elements To -=========================== +Snap Target for Individual Elements +=================================== .. reference:: :Mode: Object, Edit, and Pose Mode - :Header: :menuselection:`Snapping --> Snap Individual Elements To` + :Header: :menuselection:`Snapping --> Snap Target for Individual Elements` :Shortcut: :kbd:`Shift-Ctrl-Tab` Type of element for individual transformed elements to snap to. @@ -152,7 +151,7 @@ Target Selection ================ Sets more detailed snapping options. The available options depend on the mode -(Object/Edit) as well as the Snap To selection. +(Object/Edit) as well as the :ref:`Snap Target `. .. _bpy.types.ToolSettings.use_snap_self: @@ -178,11 +177,6 @@ Include Non-Edited :guilabel:`Edit Mode` Exclude Non-Selectable Snap only to objects that are selectable. -.. _bpy.types.ToolSettings.use_snap_grid_absolute: - -Absolute Grid Snap :guilabel:`Increment` - Snaps to the grid, instead of snapping in increments relative to the current location. - .. _bpy.types.ToolSettings.use_snap_align_rotation: Align Rotation to Target diff --git a/manual/editors/uv/controls/snapping.rst b/manual/editors/uv/controls/snapping.rst index c643ad69c..86368dec2 100644 --- a/manual/editors/uv/controls/snapping.rst +++ b/manual/editors/uv/controls/snapping.rst @@ -12,8 +12,8 @@ see :ref:`UV Editing `. .. _bpy.types.ToolSettings.snap_uv_element: -Snap To -======= +Snap Target +=========== .. reference:: @@ -30,8 +30,8 @@ Increment original location. In other words, it lets you move the selection in "increments" of the grid cell size. - If you want to snap to the viewport grid instead, you can enable *Absolute Grid Snap* - (see below). +Grid + Snaps to grid points. Vertex Snaps to the vertex that's closest to the mouse cursor. @@ -40,12 +40,7 @@ Vertex Additional Options ================== -.. _bpy.types.ToolSettings.use_snap_uv_grid_absolute: - -Absolute Grid Snap :guilabel:`Increment` - Snaps to the grid, instead of snapping in increments relative to the current location. - -Target :guilabel:`Vertex` +Snap Base :guilabel:`Vertex` See :ref:`3D Viewport Snapping ` for more information. @@ -55,3 +50,11 @@ Affect Specifies which transformations are affected by snapping. By default, snapping only happens while moving something, but you can also enable it for rotating and scaling. + + +Rotation Increment +====== + +Angle used in incremental snapping for the rotation operator. +The second value is the `Rotation Precision Increment`, used for finer transformations +and activated by default with the `Shift` key. diff --git a/manual/images/editors_3dview_controls_snapping_element-menu.png b/manual/images/editors_3dview_controls_snapping_element-menu.png index 6eb9a9da9..67c1d7d75 100644 --- a/manual/images/editors_3dview_controls_snapping_element-menu.png +++ b/manual/images/editors_3dview_controls_snapping_element-menu.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03e2aa8ab8b5f381b3a78dc067f6622378229a7187f248b880bcac65345bdae7 -size 28787 +oid sha256:7ebac80bf4b1b5f7a7036f9b0aec683f21929f07c3f93ca711208d0ba1b74277 +size 28310 diff --git a/manual/modeling/transform/modal_map.rst b/manual/modeling/transform/modal_map.rst index 136f4698b..3259060d1 100644 --- a/manual/modeling/transform/modal_map.rst +++ b/manual/modeling/transform/modal_map.rst @@ -44,9 +44,16 @@ Set Snap Base Snap Base is taken automatically depending on the :ref:`Snap Base ` options. However, this automatic snap detection point of origin is not always what the user desires. Therefore, transform operations have a utility to set a new snap origin point during the transformation. + By default the hotkey is :kbd:`B`. +.. note:: + + If only Snap to Increment is enabled as :ref:`Snap Target `, + the targets `Vert`, `Edge`, `Face`, `Edge Center`, `Edge Perpendicular` will be used instead. + + Add Snap Point -------------- -- 2.30.2 From 6a8fec1a4ad8c8e66bc62f6b21806aa60dfe2ecf Mon Sep 17 00:00:00 2001 From: Germano Cavalcante <=> Date: Sun, 7 Apr 2024 10:55:40 -0300 Subject: [PATCH 3/3] Remove note about Incremental Snap's "Default" behavior | Add description for removed Note Based Incremental Snap | Style and Formatting Fixes | Improve/Fix Set Snap Base documentation --- manual/editors/3dview/controls/snapping.rst | 13 +++++-------- manual/editors/uv/controls/snapping.rst | 13 +++++-------- manual/modeling/transform/modal_map.rst | 10 ++++++---- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/manual/editors/3dview/controls/snapping.rst b/manual/editors/3dview/controls/snapping.rst index a361c2e96..3eb24f966 100644 --- a/manual/editors/3dview/controls/snapping.rst +++ b/manual/editors/3dview/controls/snapping.rst @@ -88,12 +88,9 @@ Determines the target which the selection will be snapped to. Increment Snaps to grid points. When in Orthographic view, the snapping increment changes depending on the zoom level. - .. note:: - - By default, this option won't snap to the grid that's displayed in the viewport, - but an imaginary grid with the same resolution that starts at the selection's - original location. In other words, it lets you move the selection in "increments" of the - grid cell size. + This option snaps to an imaginary grid that starts at the selection's original location and has the same + resolution as the viewport grid. In other words, it lets you move the selection in "increments" of the + grid cell size. Grid Snaps to the grid that's displayed in the viewport. Vertex @@ -220,8 +217,8 @@ By default, snapping only happens while moving something, but you can also enable it for rotating and scaling. Rotation Increment -====== +================== Angle used in incremental snapping for the rotation operator. The second value is the `Rotation Precision Increment`, used for finer transformations -and activated by default with the `Shift` key. +and activated by default with the :kbd:`Shift` key. diff --git a/manual/editors/uv/controls/snapping.rst b/manual/editors/uv/controls/snapping.rst index 86368dec2..35447403f 100644 --- a/manual/editors/uv/controls/snapping.rst +++ b/manual/editors/uv/controls/snapping.rst @@ -23,12 +23,9 @@ Snap Target Increment Snaps to grid points. - .. note:: - - By default, this option won't snap to the grid that's displayed in the editor, - but an imaginary grid with the same resolution that starts at the selection's - original location. In other words, it lets you move the selection in "increments" of the - grid cell size. + This option snaps to an imaginary grid that starts at the selection's original location and has the same + resolution as the grid displayed in the editor. In other words, it lets you move the selection in + "increments" of the grid cell size. Grid Snaps to grid points. @@ -53,8 +50,8 @@ but you can also enable it for rotating and scaling. Rotation Increment -====== +================== Angle used in incremental snapping for the rotation operator. The second value is the `Rotation Precision Increment`, used for finer transformations -and activated by default with the `Shift` key. +and activated by default with the :kbd:`Shift` key. diff --git a/manual/modeling/transform/modal_map.rst b/manual/modeling/transform/modal_map.rst index 3259060d1..cccc51b8f 100644 --- a/manual/modeling/transform/modal_map.rst +++ b/manual/modeling/transform/modal_map.rst @@ -41,9 +41,11 @@ The default hotkey in this case is :kbd:`Ctrl`. Set Snap Base ------------- -Snap Base is taken automatically depending on the :ref:`Snap Base ` options. -However, this automatic snap detection point of origin is not always what the user desires. -Therefore, transform operations have a utility to set a new snap origin point during the transformation. +The Snap Base is automatically determined based on the :ref:`Snap Base ` options. +However, this automatic snap detection point of origin may not always align with the user's intentions. +Therefore, transform operations include a utility to set a new snap origin point during the transformation. +The new Snap Base will correspond to the snap point whose target is defined by the +:ref:`Snap Target `. By default the hotkey is :kbd:`B`. @@ -51,7 +53,7 @@ By default the hotkey is :kbd:`B`. .. note:: If only Snap to Increment is enabled as :ref:`Snap Target `, - the targets `Vert`, `Edge`, `Face`, `Edge Center`, `Edge Perpendicular` will be used instead. + the targets `Vertex`, `Edge`, `Face` and `Edge Center` will be used instead. Add Snap Point -- 2.30.2