[Bf-docboard-svn] bf-manual: [9315] Merge branch 'blender-3.2-release'

[Aaron Carlisle]

Revision: 9315
          https://developer.blender.org/rBM9315
Author:   Blendify
Date:     2022-05-28 04:02:50 +0200 (Sat, 28 May 2022)
Log Message:
-----------
Merge branch 'blender-3.2-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/addons/import_export/scene_gltf2.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-05-28 02:02:39 UTC (rev 9314)
+++ trunk/blender_docs	2022-05-28 02:02:50 UTC (rev 9315)

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-9312
\ No newline at end of property
+/branches/blender-3.2-release/blender_docs:9236-9314
\ 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-28 02:02:39 UTC (rev 9314)
+++ trunk/blender_docs/manual/addons/import_export/scene_gltf2.rst	2022-05-28 02:02:50 UTC (rev 9315)
@@ -651,7 +651,7 @@
 Loose Points
    Export loose points as glTF points, using the material from the first material slot.
 Materials
-   Export full materials, only placeholders (all primitives but without 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