[Bf-docboard-svn] bf-manual: [9305] trunk/blender_docs/manual: Merge branch 'blender-3.2-release'
Aaron Carlisle
noreply at blender.org
Wed May 25 04:32:46 CEST 2022
Revision: 9305
https://developer.blender.org/rBM9305
Author: Blendify
Date: 2022-05-25 04:32:46 +0200 (Wed, 25 May 2022)
Log Message:
-----------
Merge branch 'blender-3.2-release'
Modified Paths:
--------------
trunk/blender_docs/manual/editors/preferences/input.rst
trunk/blender_docs/manual/editors/video_sequencer/sequencer/navigating.rst
trunk/blender_docs/manual/grease_pencil/modifiers/generate/simplify.rst
trunk/blender_docs/manual/modeling/modifiers/modify/weight_mix.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2022-05-25 02:31:17 UTC (rev 9304)
+++ trunk/blender_docs 2022-05-25 02:32:46 UTC (rev 9305)
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-9298
\ No newline at end of property
+/branches/blender-3.2-release/blender_docs:9236-9304
\ No newline at end of property
Modified: trunk/blender_docs/manual/editors/preferences/input.rst
===================================================================
--- trunk/blender_docs/manual/editors/preferences/input.rst 2022-05-25 02:31:17 UTC (rev 9304)
+++ trunk/blender_docs/manual/editors/preferences/input.rst 2022-05-25 02:32:46 UTC (rev 9305)
@@ -133,23 +133,21 @@
Navigation
Navigation style for the viewport.
- Free
- Uses the full 6-degrees of freedom.
- Orbit
- Orbit about the view center.
+ :Free: Uses the full 6-degrees of freedom.
+ :Orbit: Orbit about the view center.
Rotation
Rotation style for the viewport.
- Turntable
- Rotates the view keeping the horizon horizontal.
- Trackball
- Is less restrictive, allowing any orientation.
+ :Turntable: Rotates the view keeping the horizon horizontal.
+ :Trackball: Is less restrictive, allowing any orientation.
Show Navigation Guide
Display the pivot point and axis during rotation.
Invert Zoom
Zoom using opposite direction.
+Lock Camera Pan/Zoom
+ Pan/zoom the camera view instead of leaving the camera view when orbiting.
Swap Y and Z Axes
Pan using up/down on the NDOF devices instead of forward/backwards.
Invert Axis Pan
Modified: trunk/blender_docs/manual/editors/video_sequencer/sequencer/navigating.rst
===================================================================
--- trunk/blender_docs/manual/editors/video_sequencer/sequencer/navigating.rst 2022-05-25 02:31:17 UTC (rev 9304)
+++ trunk/blender_docs/manual/editors/video_sequencer/sequencer/navigating.rst 2022-05-25 02:32:46 UTC (rev 9305)
@@ -36,6 +36,11 @@
Zoom :kbd:`Shift-B`
Click and drag to draw a rectangle and zoom to this rectangle.
+.. _bpy.types.SpaceSequenceEditor.use_clamp_view:
+
+Limit View to Contents
+ Limit the timeline's height to the maximum used channel slot.
+
Navigation
Play Animation :kbd:`Spacebar`
Start or stop playback of animation. This will start playback in all editors.
Modified: trunk/blender_docs/manual/grease_pencil/modifiers/generate/simplify.rst
===================================================================
--- trunk/blender_docs/manual/grease_pencil/modifiers/generate/simplify.rst 2022-05-25 02:31:17 UTC (rev 9304)
+++ trunk/blender_docs/manual/grease_pencil/modifiers/generate/simplify.rst 2022-05-25 02:32:46 UTC (rev 9305)
@@ -43,6 +43,9 @@
Smaller values will require more points to recreate the stroke,
while larger values will result in fewer points needed to recreate the curve.
+ Sharp Threshold
+ Preserve corners that have sharper angle than this threshold.
+
Merge
Simplifies the strokes by merging points that are closer than a specified distance to each other.
Modified: trunk/blender_docs/manual/modeling/modifiers/modify/weight_mix.rst
===================================================================
--- trunk/blender_docs/manual/modeling/modifiers/modify/weight_mix.rst 2022-05-25 02:31:17 UTC (rev 9304)
+++ trunk/blender_docs/manual/modeling/modifiers/modify/weight_mix.rst 2022-05-25 02:32:46 UTC (rev 9305)
@@ -29,31 +29,30 @@
The Vertex Weight Mix modifier panel.
-Vertex Group A/B
- :A: The vertex group to affect.
- :B: The second vertex group to mix into the affected one.
- Leave it empty if you only want to mix in a simple value.
+Vertex Group A, B
+ - **A**: The vertex group to affect.
+ - **B**: The second vertex group to mix into the affected one.
+ Leave it empty if you only want to mix in a simple value.
Invert Weights A/B
Invert the influence of the vertex group.
-Default Weight A/B
- :A: The default weight to assign to all vertices not in the given vertex group.
- :B: The default weight to assign to all vertices not in the given second vertex group.
+Default Weight A, B
+ - **A**: The default weight to assign to all vertices not in the given vertex group.
+ - **B**: The default weight to assign to all vertices not in the given second vertex group.
+.. container:: lead
+
+ .. clear
+
Vertex Set
Choose which vertices will be affected.
- All
- Affects all vertices, disregarding the vertex groups content.
- Vertex Group A
- Affects only vertices belonging to the affected vertex group.
- Vertex Group B
- Affects only vertices belonging to the second vertex group.
- Vertex Group A or B
- Affects only vertices belonging to at least one of the vertex groups.
- Vertex Group A and B
- Affects only vertices belonging to both vertex groups.
+ :All: Affects all vertices, disregarding the vertex groups content.
+ :Vertex Group A: Affects only vertices belonging to the affected vertex group.
+ :Vertex Group B: Affects only vertices belonging to the second vertex group.
+ :Vertex Group A or B: Affects only vertices belonging to at least one of the vertex groups.
+ :Vertex Group A and B: Affects only vertices belonging to both vertex groups.
.. important::
@@ -63,20 +62,15 @@
Mix Mode
How the vertex group weights are affected by the other vertex group's weights.
- Replace
- Replaces affected weights with the second group's weights.
- Add
- Adds the values of *Group B* to *Group A*.
- Subtract
- Subtracts the values of *Group B* from *Group A*.
- Multiply
- Multiplies the values of *Group B* with *Group A*.
- Divide
- Divides the values of *Group A* by *Group B*.
- Difference
- Subtracts the smaller of the two values from the larger.
- Average
- Adds the values together, then divides by 2.
+ :Replace: Replaces affected weights with the second group's weights.
+ :Add: Adds the values of *Group B* to *Group A*.
+ :Subtract: Subtracts the values of *Group B* from *Group A*.
+ :Multiply: Multiplies the values of *Group B* with *Group A*.
+ :Divide: Divides the values of *Group A* by *Group B*.
+ :Difference: Subtracts the smaller of the two values from the larger.
+ :Average: Adds the values together, then divides by 2.
+ :Minimum: Uses the smallest weight value of VGroup A's or VGroup B's weights.
+ :Maximum: Uses the largest weight value of VGroup A's or VGroup B's weights.
Normalize Weights
Scale the weights in the vertex group to keep the relative weight
More information about the Bf-docboard-svn
mailing list