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

Aaron Carlisle noreply at blender.org
Tue May 31 03:37:59 CEST 2022 

Revision: 9323
          https://developer.blender.org/rBM9323
Author:   Blendify
Date:     2022-05-31 03:37:59 +0200 (Tue, 31 May 2022)
Log Message:
-----------
Merge branch 'blender-3.2-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/animation/actions.rst
    trunk/blender_docs/manual/compositing/types/output/file.rst
    trunk/blender_docs/manual/editors/nla/editing.rst
    trunk/blender_docs/manual/editors/video_sequencer/preview/header.rst
    trunk/blender_docs/manual/files/import_export/collada.rst
    trunk/blender_docs/manual/files/import_export/obj.rst
    trunk/blender_docs/manual/grease_pencil/animation/tools.rst
    trunk/blender_docs/manual/render/color_management.rst
    trunk/blender_docs/manual/render/output/properties/output.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-05-31 01:28:03 UTC (rev 9322)
+++ trunk/blender_docs	2022-05-31 01:37:59 UTC (rev 9323)

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-9314
\ No newline at end of property
+/branches/blender-3.2-release/blender_docs:9236-9322
\ No newline at end of property
Modified: trunk/blender_docs/manual/animation/actions.rst
===================================================================
--- trunk/blender_docs/manual/animation/actions.rst	2022-05-31 01:28:03 UTC (rev 9322)
+++ trunk/blender_docs/manual/animation/actions.rst	2022-05-31 01:37:59 UTC (rev 9323)
@@ -65,27 +65,6 @@
 The :doc:`NLA Editor </editors/nla/index>` is used to blend multiple actions together.
 
 
-.. _bpy.ops.nla.bake:
-
-Bake Action
-===========
-
-.. reference::
-
-   :Editor:    3D Viewport
-   :Mode:      Object and Pose Modes
-   :Menu:      :menuselection:`Object/Pose --> Animation --> Bake Action...`
-
-The final motion of objects or bones depends not only on the keyframed animation,
-but also on any active F-Curve modifiers, drivers, and constraints.
-On each frame of all the scene's frames, the *Bake Action* tool computes
-the final animation of the selected objects or bones with all those
-modifiers, drivers, and constraints applied, and keyframes the result.
-
-This can be useful for adding deviation to a cyclic action like a :term:`Walk Cycle`,
-or to create a keyframe animation created from drivers or constraints.
-
-
 .. _actions-frame-range:
 
 Manual Frame Range

Modified: trunk/blender_docs/manual/compositing/types/output/file.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/output/file.rst	2022-05-31 01:28:03 UTC (rev 9322)
+++ trunk/blender_docs/manual/compositing/types/output/file.rst	2022-05-31 01:37:59 UTC (rev 9323)
@@ -39,7 +39,7 @@
    ``{base path}/{file name}{frame number}.{extension}``.
 
    Besides being split into two settings, in all other respects,
-   this setting is treated the same as the :ref:`render output path <render-tab-output>`.
+   this setting is treated the same as the :ref:`render output path <bpy.types.RenderSettings.filepath>`.
 File Format
    Label that shows the selected file format.
 

Modified: trunk/blender_docs/manual/editors/nla/editing.rst
===================================================================
--- trunk/blender_docs/manual/editors/nla/editing.rst	2022-05-31 01:28:03 UTC (rev 9322)
+++ trunk/blender_docs/manual/editors/nla/editing.rst	2022-05-31 01:37:59 UTC (rev 9323)
@@ -17,6 +17,32 @@
 Todo.
 
 
+.. _bpy.ops.nla.bake:
+
+Bake Action
+===========
+
+.. reference::
+
+   :Editor:    Nonlinear Animation
+   :Menu:      :menuselection:`Edit --> Bake Action`
+
+.. reference::
+
+   :Editor:    3D Viewport
+   :Mode:      Object and Pose Modes
+   :Menu:      :menuselection:`Header --> Object Animation --> Bake Action...`
+
+The final motion of objects or bones depends not only on the keyframed animation,
+but also on any active F-Curve modifiers, drivers, and constraints.
+On each frame of all the scene's frames, the *Bake Action* operator computes
+the final animation of the selected objects or bones with all those
+modifiers, drivers, and constraints applied, and keyframes the result.
+
+This can be useful for adding deviation to a cyclic action like a :term:`Walk Cycle`,
+or to create a keyframe animation created from drivers or constraints.
+
+
 .. _bpy.ops.nla.duplicate:
 
 Duplicate

Modified: trunk/blender_docs/manual/editors/video_sequencer/preview/header.rst
===================================================================
--- trunk/blender_docs/manual/editors/video_sequencer/preview/header.rst	2022-05-31 01:28:03 UTC (rev 9322)
+++ trunk/blender_docs/manual/editors/video_sequencer/preview/header.rst	2022-05-31 01:37:59 UTC (rev 9323)
@@ -21,6 +21,9 @@
 Preview During Transform
    Show a preview of the start or end frame while transforming a strip's start/end handles.
 
+Frame Selected
+   Zoom and position the bounding box of the selected image into the center of the preview.
+
 Fit Preview in Window :kbd:`Home`
    Resize the preview so that it fits in the area.
 Zoom :kbd:`Shift-B`

Modified: trunk/blender_docs/manual/files/import_export/collada.rst
===================================================================
--- trunk/blender_docs/manual/files/import_export/collada.rst	2022-05-31 01:28:03 UTC (rev 9322)
+++ trunk/blender_docs/manual/files/import_export/collada.rst	2022-05-31 01:37:59 UTC (rev 9323)
@@ -293,7 +293,7 @@
 - Animations of armatures in Object Mode.
 - Fully rigified armature animations (referring to the Rigify add-on). For export of rigified armature animations:
 
-  - Select Bake Action. (Open :doc:`/interface/controls/templates/operator_search` and type "Bake Action".)
+  - Run the :ref:`bpy.ops.nla.bake` operator.
   - If you have only the deform bones selected check *Only Selected*.
     This will give smaller dae. Otherwise uncheck *Only Selected*.
   - Check *Clear Constraints*.

Modified: trunk/blender_docs/manual/files/import_export/obj.rst
===================================================================
--- trunk/blender_docs/manual/files/import_export/obj.rst	2022-05-31 01:28:03 UTC (rev 9322)
+++ trunk/blender_docs/manual/files/import_export/obj.rst	2022-05-31 01:37:59 UTC (rev 9323)
@@ -118,14 +118,48 @@
    Generate Bitflags for smooth Groups.
 
 
+Compatibility
+-------------
+
+NURBS surfaces, text3D and metaballs are converted to meshes at export time.
+
+
+.. _bpy.ops.wm.obj_import:
+
 Importing
 =========
 
-Importing OBJ-files is currently handled by a python importer which is included as an addon.
-It's documentation can be found here: `OBJ Importer </addons/import_export/scene_obj>`.
+Import geometry and curves to the OBJ format.
 
+If there is a matching ``.MTL`` for the OBJ then its materials will be imported too.
 
-Compatibility
-=============
+.. note::
 
-NURBS surfaces, text3D and metaballs are converted to meshes at export time.
+   Blender now only supports complex node-based shading. OBJ having a fixed pipeline-like support of materials,
+   this add-on uses the :doc:`generic wrapper </addons/import_export/node_shaders_info>`
+   featured by Blender to convert between both.
+
+
+Properties
+----------
+
+Transform
+^^^^^^^^^
+
+Clamp Bounding Box
+   OBJ-files often vary greatly in scale, this setting clamps the imported file to a fixed size.
+Axis Forward, Up
+   Since many applications use a different axis for 'Up', these are axis conversion for these settings,
+   Forward and Up axes -- By mapping these to different axes you can convert rotations
+   between applications default up and forward axes.
+
+   Blender uses Y Forward, Z Up (since the front view looks along the +Y direction).
+   For example, it's common for applications to use Y as the up axis, in that case -Z Forward, Y Up is needed.
+
+
+Options
+^^^^^^^
+
+Validate Meshes
+   Checks the imported mesh data for errors and corrects them if needed.
+   This slows down the importing process but can fix glitches in the imported mesh.

Modified: trunk/blender_docs/manual/grease_pencil/animation/tools.rst
===================================================================
--- trunk/blender_docs/manual/grease_pencil/animation/tools.rst	2022-05-31 01:28:03 UTC (rev 9322)
+++ trunk/blender_docs/manual/grease_pencil/animation/tools.rst	2022-05-31 01:37:59 UTC (rev 9323)
@@ -89,7 +89,7 @@
    :Menu:      :menuselection:`Object --> Animation --> Bake Mesh to Grease Pencil...`
 
 Converts each frame of a mesh animation within a selected frame range to
-a Grease Pencil object keyframed strokes. The *Bake Action* tool computes the final animation of
+a Grease Pencil object keyframed strokes. The *Bake Action* operator computes the final animation of
 the selected objects with all those modifiers, drivers, and constraints applied, and keyframes the result.
 
 Target Object

Modified: trunk/blender_docs/manual/render/color_management.rst
===================================================================
--- trunk/blender_docs/manual/render/color_management.rst	2022-05-31 01:28:03 UTC (rev 9322)
+++ trunk/blender_docs/manual/render/color_management.rst	2022-05-31 01:37:59 UTC (rev 9323)
@@ -93,8 +93,8 @@
 
 .. _render-post-color-management:
 
-Settings
-========
+Render Settings
+===============
 
 .. reference::
 
@@ -106,6 +106,11 @@
 
    Color Management properties.
 
+These are color management settings that are used across Blender.
+These color management settings are Scene specific so settings can be customized per Scene.
+Color management can also be overridden when saving images;
+this behavior can be set in the :ref:`Output Color Management Properties <render-output-color-management-panel>`.
+
 .. _bpy.types.ColorManagedDisplaySettings.display_device:
 
 Display Device
@@ -116,8 +121,9 @@
    It would typically be changed when viewing the image on another display device connected to the computer,
    or when writing out image files intended to be displayed on another device.
 
-   *Rec709* is commonly used for HDTVs, while *XYZ* and *DCI-P3* are common for digital projectors.
-   Color management can be disabled by setting the device to *None*.
+   :sRGB: Used by most displays.
+   :XYZ: Commonly used by digital projectors.
+   :None: Disables color management.
 
 .. _bpy.types.ColorManagedViewSettings.view_transform:
 

Modified: trunk/blender_docs/manual/render/output/properties/output.rst
===================================================================
--- trunk/blender_docs/manual/render/output/properties/output.rst	2022-05-31 01:28:03 UTC (rev 9322)
+++ trunk/blender_docs/manual/render/output/properties/output.rst	2022-05-31 01:37:59 UTC (rev 9323)
@@ -1,4 +1,3 @@
-.. _render-tab-output:
 
 ******
 Output
@@ -73,6 +72,26 @@
    - Start as many machines as you wish rendering to that directory.
 
 
+.. _render-output-color-management-panel:
+
+Color Management
+================
+

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-docboard-svn mailing list