[Bf-docboard-svn] bf-manual: [9026] Merge branch 'blender-3.0-release'

[Aaron Carlisle]

Revision: 9026
          https://developer.blender.org/rBM9026
Author:   Blendify
Date:     2022-02-25 00:20:53 +0100 (Fri, 25 Feb 2022)
Log Message:
-----------
Merge branch 'blender-3.0-release'

Modified Paths:
--------------
    branches/blender-3.1-release/blender_docs/manual/animation/armatures/bones/properties/display.rst

Property Changed:
----------------
    branches/blender-3.1-release/blender_docs/

Index: branches/blender-3.1-release/blender_docs
===================================================================
--- branches/blender-3.1-release/blender_docs	2022-02-24 19:54:16 UTC (rev 9025)
+++ branches/blender-3.1-release/blender_docs	2022-02-24 23:20:53 UTC (rev 9026)

Property changes on: branches/blender-3.1-release/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/blender-2.92-release/blender_docs:7610-7921
 /branches/blender-2.93-release/blender_docs:7959-8113
-/branches/blender-3.0-release/blender_docs:8543-9023
+/branches/blender-3.0-release/blender_docs:8543-9025
 /trunk/blender_docs:8920
\ No newline at end of property
Modified: branches/blender-3.1-release/blender_docs/manual/animation/armatures/bones/properties/display.rst
===================================================================
--- branches/blender-3.1-release/blender_docs/manual/animation/armatures/bones/properties/display.rst	2022-02-24 19:54:16 UTC (rev 9025)
+++ branches/blender-3.1-release/blender_docs/manual/animation/armatures/bones/properties/display.rst	2022-02-24 23:20:53 UTC (rev 9026)
@@ -20,7 +20,6 @@
 
 
 .. _bpy.types.PoseBone.custom_shape:
-.. _bpy.types.Bone.show_wire:
 
 Custom Shape
 ============
@@ -32,12 +31,24 @@
 
 Custom Object
    Object that defines the custom shape of the selected bone.
+
+Scale X, Y, Z
+   Additional scaling factor to apply to the custom shape.
+
+Translation X, Y, Z
+   Additional translation factor to apply to the custom shape.
+
+Rotation X, Y, Z
+   Additional rotation factor to apply to the custom shape.
+
 Override Transform
    Bone that defines the display transform of the custom shape.
-Scale
-   Additional scaling factor to apply to the custom shape.
+
 Scale to Bone Length
    Option not to use bones length, so that changes in Edit Mode don't resize the custom shape.
+
+.. _bpy.types.Bone.show_wire:
+
 Wireframe
    When enabled, bone is displayed in wireframe mode regardless of the viewport display mode.
    Useful for non-obstructive custom bone chains.