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

Tue May 24 19:57:34 CEST 2022

Revision: 9299
          https://developer.blender.org/rBM9299
Author:   julien
Date:     2022-05-24 19:57:33 +0200 (Tue, 24 May 2022)
Log Message:
-----------
Merge branch 'blender-3.2-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/addons/import_export/scene_gltf2.rst
    trunk/blender_docs/manual/addons/mesh/3d_print_toolbox.rst
    trunk/blender_docs/manual/editors/video_sequencer/sequencer/sidebar/strip.rst
    trunk/blender_docs/manual/interface/window_system/areas.rst

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

Index: trunk/blender_docs
===================================================================

--- trunk/blender_docs	2022-05-24 17:55:37 UTC (rev 9298)
+++ trunk/blender_docs	2022-05-24 17:57:33 UTC (rev 9299)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,4 ##
 /branches/blender-2.93-release/blender_docs:7959-8113
 /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-9289
\ No newline at end of property
+/branches/blender-3.2-release/blender_docs:9236-9298
\ No newline at end of property
Modified: trunk/blender_docs/manual/addons/import_export/scene_gltf2.rst
===================================================================
--- trunk/blender_docs/manual/addons/import_export/scene_gltf2.rst	2022-05-24 17:55:37 UTC (rev 9298)
+++ trunk/blender_docs/manual/addons/import_export/scene_gltf2.rst	2022-05-24 17:57:33 UTC (rev 9299)
@@ -609,6 +609,14 @@
 
 Selected Objects
    Export selected objects only.
+Visible Objects
+   Export visible objects only.
+Renderable Objects
+   Export renderable objects only.
+Active Collection
+   Export objects from active collection only.
+Active Scene
+   Export active scene only.
 Custom Properties
    Export custom properties as glTF extras.
 Cameras
@@ -629,7 +637,7 @@
 
 Apply Modifiers
    Export objects using the evaluated mesh, meaning the resulting mesh after all
-   :doc:`Modifiers </modeling/modifiers/index>` have been calculated.
+:doc:`Modifiers </modeling/modifiers/index>` have been calculated.
 UVs
    Export UVs (texture coordinates) with meshes.
 Normals
@@ -643,10 +651,12 @@
 Loose Points
    Export loose points as glTF points, using the material from the first material slot.
 Materials
-   Export materials.
+   Export full materials, only placeholders (all primitives but without materials), 
+   or does not export materials. (In that last case, primitive are merged, lossing material slot information).
 Images
    Output format for images. PNG is lossless and generally preferred, but JPEG might be preferable for
    web applications due to the smaller file size.
+   If None is chosen, materials are exported without textures.
 
 
 Compression
@@ -662,6 +672,8 @@
    Higher values result in better compression rates.
 Texture Coordinates
    Higher values result in better compression rates.
+Color
+   Higher values result in better compression rates.
 Generic
    Higher values result in better compression rates.
 
@@ -671,6 +683,8 @@
 
 Use Current Frame
    Export the scene in the current animation frame.
+   For rigs, when off, rest pose is used as default pose for joints in glTF file.
+   When on, the current frame is used as default pose for joints in glTF file.
 
 
 Animation
@@ -686,8 +700,10 @@
    Apply sampling to all animations.
 Group by NLA Track
    Whether to export NLA strip animations.
+Optimize Animation Size
+   Reduce exported file-size by removing duplicate keyframes.
 Export Deformation Bones Only
-   Export deformation bones only (and needed bones for hierarchy).
+   Export deformation bones only.
 
 
 Shape Keys

Modified: trunk/blender_docs/manual/addons/mesh/3d_print_toolbox.rst
===================================================================
--- trunk/blender_docs/manual/addons/mesh/3d_print_toolbox.rst	2022-05-24 17:55:37 UTC (rev 9298)
+++ trunk/blender_docs/manual/addons/mesh/3d_print_toolbox.rst	2022-05-24 17:57:33 UTC (rev 9299)
@@ -89,7 +89,7 @@
 
 	.. figure:: /images/3dprint_intersect.jpg
 
-:Degenerate:
+Degenerate
 	Faces and edges which have 0 area or length, are considered `degenerate`.
 	In this example, the top face of a cube has been scaled down to 0,
 	but have not been merged. A :menuselection:`Merge --> By Distance` would resolve this issue.
@@ -98,7 +98,7 @@
 
 		There's a hidden face here.
 
-:Distorted:
+Distorted
 	The vertices of a quad or ngon can be folded in such a way that the face is not flat.
 	In practice, quads are rarely ever flat. When exporting, these faces are converted to triangles.
 	If the surface is excessively deformed, this can result in unexpected shapes.
@@ -124,7 +124,7 @@
 
 	.. figure:: /images/3dprint_overhang.jpg
 
-:Check All:
+Check All
 	Performs all of the above checks at once. In this example, Suzanne shows quite a few problems.
 	This is because the eyes are separate parts, and the sockets have holes.
 	This makes the mesh not `Solid` and `Intersecting`. Some of the faces are `Distorted`.

Modified: trunk/blender_docs/manual/editors/video_sequencer/sequencer/sidebar/strip.rst
===================================================================
--- trunk/blender_docs/manual/editors/video_sequencer/sequencer/sidebar/strip.rst	2022-05-24 17:55:37 UTC (rev 9298)
+++ trunk/blender_docs/manual/editors/video_sequencer/sequencer/sidebar/strip.rst	2022-05-24 17:57:33 UTC (rev 9299)
@@ -50,6 +50,14 @@
 
    :Panel:     :menuselection:`Sidebar --> Strip --> Transform`
 
+.. _bpy.types.SequenceTransform.filter:
+
+Filter
+   Interpolation Methods.
+
+   :Nearest: No interpolation, uses nearest neighboring pixel.
+   :Bilinear: Simple interpolation between adjacent pixels.
+
 .. _bpy.types.SequenceTransform.offset:
 
 Position X, Y

Modified: trunk/blender_docs/manual/interface/window_system/areas.rst
===================================================================
--- trunk/blender_docs/manual/interface/window_system/areas.rst	2022-05-24 17:55:37 UTC (rev 9298)
+++ trunk/blender_docs/manual/interface/window_system/areas.rst	2022-05-24 17:57:33 UTC (rev 9299)
@@ -80,7 +80,7 @@
 Join Areas
    Shows the join direction overlay.
 Swap Areas
-   Swaps this area with the adjacente one.
+   Swaps this area with the adjacent one.
 
 
 Swapping Contents

