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

[Aaron Carlisle]

Revision: 9610
          https://developer.blender.org/rBM9610
Author:   Blendify
Date:     2022-10-10 04:22:36 +0200 (Mon, 10 Oct 2022)
Log Message:
-----------
Merge branch 'blender-3.3-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/editors/preferences/input.rst
    trunk/blender_docs/manual/files/import_export/obj.rst
    trunk/blender_docs/manual/grease_pencil/modes/object/trace_image.rst
    trunk/blender_docs/manual/scene_layout/collections/collections.rst
    trunk/blender_docs/manual/scene_layout/object/properties/line_art.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-10-10 02:19:47 UTC (rev 9609)
+++ trunk/blender_docs	2022-10-10 02:22:36 UTC (rev 9610)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -3,4 +3,4 ##
 /branches/blender-3.0-release/blender_docs:8543-9034
 /branches/blender-3.1-release/blender_docs:8904-9230
 /branches/blender-3.2-release/blender_docs:9236-9417
-/branches/blender-3.3-release/blender_docs:9438-9604
\ No newline at end of property
+/branches/blender-3.3-release/blender_docs:9438-9609
\ No newline at end of property
Modified: trunk/blender_docs/manual/editors/preferences/input.rst
===================================================================
--- trunk/blender_docs/manual/editors/preferences/input.rst	2022-10-10 02:19:47 UTC (rev 9609)
+++ trunk/blender_docs/manual/editors/preferences/input.rst	2022-10-10 02:22:36 UTC (rev 9610)
@@ -99,6 +99,17 @@
       Once the cursor moves past this threshold, selection stops cycling and picks the closest item.
 
 
+Touchpad
+========
+
+.. note::
+
+   This panel is only available on Windows or macOS.
+
+Multitouch Gestures
+   Use multitouch gestures for navigation with touchpad, instead of scroll wheel emulation.
+
+
 Tablet
 ======
 

Modified: trunk/blender_docs/manual/files/import_export/obj.rst
===================================================================
--- trunk/blender_docs/manual/files/import_export/obj.rst	2022-10-10 02:19:47 UTC (rev 9609)
+++ trunk/blender_docs/manual/files/import_export/obj.rst	2022-10-10 02:22:36 UTC (rev 9610)
@@ -28,7 +28,7 @@
 Object Properties
 ^^^^^^^^^^^^^^^^^
 
-Selected Only
+Limit to: Selected Only
    Only export the selected objects. Otherwise export all objects in the scene.
 Scale
    Global scale to use on export.
@@ -39,7 +39,7 @@
 
    Blender uses Y Forward, Z Up (since the front view looks along the +Y direction).
    For example, its common for applications to use Y as the up axis, in that case -Z Forward, Y Up is needed.
-Apply Modifiers
+Objects: Apply Modifiers
    Export objects using the evaluated mesh, meaning the resulting mesh after all
    :doc:`Modifiers </modeling/modifiers/index>` have been calculated.
 Properties
@@ -64,8 +64,8 @@
    :Copy: Copy the file on exporting and reference it with a relative path.
 
 
-Geometry
-^^^^^^^^
+Geometry Properties
+^^^^^^^^^^^^^^^^^^^
 
 UV Coordinates
    Write out the active UV layers coordinates from Blender.
@@ -85,8 +85,8 @@
    Write out NURBS curves as OBJ NURBS rather than converting to geometry.
 
 
-Grouping
-^^^^^^^^
+Grouping Properties
+^^^^^^^^^^^^^^^^^^^
 
 Object Groups
    Write out each Blender object as an OBJ object.

Modified: trunk/blender_docs/manual/grease_pencil/modes/object/trace_image.rst
===================================================================
--- trunk/blender_docs/manual/grease_pencil/modes/object/trace_image.rst	2022-10-10 02:19:47 UTC (rev 9609)
+++ trunk/blender_docs/manual/grease_pencil/modes/object/trace_image.rst	2022-10-10 02:22:36 UTC (rev 9610)
@@ -68,3 +68,6 @@
 
 Start at Current Frame
    When enabled, start the tracing process at the current image frame.
+
+Trace Frame
+   Used to trace only one frame of the image sequence, set to zero to trace all.

Modified: trunk/blender_docs/manual/scene_layout/collections/collections.rst
===================================================================
--- trunk/blender_docs/manual/scene_layout/collections/collections.rst	2022-10-10 02:19:47 UTC (rev 9609)
+++ trunk/blender_docs/manual/scene_layout/collections/collections.rst	2022-10-10 02:22:36 UTC (rev 9610)
@@ -76,6 +76,7 @@
       Objects in the collection will only produce intersection lines in
       the scene and their own geometry stay invisible.
    :No Intersection: Include this collection but do not generate intersection lines.
+   :Force Intersection: Generate intersection lines even with objects that disabled intersection.
 
 .. _bpy.types.Collection.lineart_use_intersection_mask:
 

Modified: trunk/blender_docs/manual/scene_layout/object/properties/line_art.rst
===================================================================
--- trunk/blender_docs/manual/scene_layout/object/properties/line_art.rst	2022-10-10 02:19:47 UTC (rev 9609)
+++ trunk/blender_docs/manual/scene_layout/object/properties/line_art.rst	2022-10-10 02:22:36 UTC (rev 9610)
@@ -36,6 +36,7 @@
       The object will not be loaded into line art at all.
    :No Intersection:
       The object will not generate intersection lines on itself or with other objects in scene.
+   :Force Intersection: Generate intersection lines even with objects that disabled intersection.
 
 .. _bpy.types.ObjectLineArt.use_crease_override: