[Bf-docboard-svn] bf-manual: [9351] trunk/blender_docs/manual: Merge branch 'blender-3.2-release'
Aaron Carlisle
noreply at blender.org
Wed Jun 8 05:23:08 CEST 2022
Revision: 9351
https://developer.blender.org/rBM9351
Author: Blendify
Date: 2022-06-08 05:23:08 +0200 (Wed, 08 Jun 2022)
Log Message:
-----------
Merge branch 'blender-3.2-release'
Modified Paths:
--------------
trunk/blender_docs/manual/editors/graph_editor/fcurves/editing.rst
trunk/blender_docs/manual/editors/nla/editing.rst
trunk/blender_docs/manual/editors/video_sequencer/sequencer/index.rst
trunk/blender_docs/manual/editors/video_sequencer/sequencer/introduction.rst
trunk/blender_docs/manual/editors/video_sequencer/sequencer/navigating.rst
trunk/blender_docs/manual/glossary/index.rst
trunk/blender_docs/manual/interface/controls/buttons/menus.rst
trunk/blender_docs/manual/modeling/curves/tools/index.rst
trunk/blender_docs/manual/modeling/curves/tools/toolbar.rst
trunk/blender_docs/manual/scene_layout/object/editing/apply.rst
trunk/blender_docs/manual/scene_layout/object/editing/parent.rst
trunk/blender_docs/manual/video_editing/edit/montage/strips/image.rst
trunk/blender_docs/manual/video_editing/edit/montage/strips/movie.rst
trunk/blender_docs/manual/video_editing/edit/montage/strips/sound.rst
Added Paths:
-----------
trunk/blender_docs/manual/editors/video_sequencer/sequencer/channels.rst
trunk/blender_docs/manual/images/modeling_curves_tools_pen_curve-properties.jpg
trunk/blender_docs/manual/images/modeling_curves_tools_pen_curve-tool-settings.jpg
trunk/blender_docs/manual/modeling/curves/tools/pen.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2022-06-08 03:22:00 UTC (rev 9350)
+++ trunk/blender_docs 2022-06-08 03:23:08 UTC (rev 9351)
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-9341
\ No newline at end of property
+/branches/blender-3.2-release/blender_docs:9236-9350
\ No newline at end of property
Modified: trunk/blender_docs/manual/editors/graph_editor/fcurves/editing.rst
===================================================================
--- trunk/blender_docs/manual/editors/graph_editor/fcurves/editing.rst 2022-06-08 03:22:00 UTC (rev 9350)
+++ trunk/blender_docs/manual/editors/graph_editor/fcurves/editing.rst 2022-06-08 03:23:08 UTC (rev 9351)
@@ -333,7 +333,7 @@
:Menu: :menuselection:`Key --> Slider Operators --> Breakdown`
Moves the selected keyframes to an in between position relative to the adjacent keyframes.
-Drag the mouse left or right to adjust the operator's *Factor* property.
+To use this operator, drag the mouse left or right to adjust the operator's *Factor* property.
Factor
The amount to favor either the left or the right key. Values less than 0.5 favor the left keyframe,
@@ -351,7 +351,7 @@
Transitions the current keyframe with the neighboring keyframes in the timeline.
In order for this operator to work, there must be a keyframe before and after the current frame.
-Drag the mouse left or right to adjust the operator's *Blend* property.
+To use this operator, drag the mouse left or right to adjust the operator's *Blend* property.
Blend
The amount to favor either the left or the right key. Values less than 0.5 favor the left keyframe,
@@ -358,6 +358,28 @@
values greater than 0.5 favor the right keyframe, a value of 0.5 results in no change.
+.. _bpy.ops.graph.blend_to_default:
+
+Blend to Default Value
+----------------------
+
+.. reference::
+
+ :Menu: :menuselection:`Key --> Slider Operators --> Blend to Neighbor`
+
+Transitions the current keyframe towards the property's default value.
+To use this operator, drag the mouse left or right to adjust the operator's *Blend* property.
+
+Blend
+ The amount to favor either the current key or the default value.
+ A value of 0 represents the current key, a value of 1 represents the default value.
+
+.. seealso::
+
+ The :ref:`Reset to Default <bpy.ops.ui.reset_default_button>` operator resets
+ any property to its default value without the need of keyframing.
+
+
.. _bpy.ops.graph.clean:
Clean Keyframes
Modified: trunk/blender_docs/manual/editors/nla/editing.rst
===================================================================
--- trunk/blender_docs/manual/editors/nla/editing.rst 2022-06-08 03:22:00 UTC (rev 9350)
+++ trunk/blender_docs/manual/editors/nla/editing.rst 2022-06-08 03:23:08 UTC (rev 9351)
@@ -214,18 +214,9 @@
(by flagging the NLA track that the action strip comes from as being "solo").
This is useful for editing stashed actions, without the rest of the NLA Stack interfering.
+When you finished editing the strip, simply go to :menuselection:`Edit --> Stop Editing Stashed Action`
+or press :kbd:`Shift-Tab`.
-Start Tweaking Strips Action
-============================
-
-.. reference::
-
- :Menu: :menuselection:`Edit --> Start Tweaking Strips Action`
- :Shortcut: :kbd:`Tab`
-
-The contents of Action strips can be edited, but you must be in *Tweak Mode* to do so.
-The keyframes of the action can then be edited in the Dope Sheet.
-
.. list-table::
* - .. figure:: /images/editors_nla_editing_nla-mode.png
@@ -238,5 +229,37 @@
Strip in Tweak mode.
-When you finished editing the strip, simply go to :menuselection:`Edit --> Tweaking Strips Action`
+
+Start Tweaking Strips Actions (Full Stack)
+==========================================
+
+.. reference::
+
+ :Menu: :menuselection:`Edit --> Start Tweaking Strips Actions (Full Stack)`
+
+Allows you to edit the contents of the strip without disabling all the tracks above the tweaked strip.
+This allows keyframing to work as expected, and preserves the pose that you visually keyed.
+
+When you finished editing the strip, simply go to :menuselection:`Edit --> Stop Tweaking Strips Actions`
or press :kbd:`Tab`.
+
+.. note::
+
+ For transitions above the tweaked strip, keyframe remapping will fail
+ for channel values that are affected by the transition.
+ A work around is to tweak the active strip without evaluating the upper NLA stack.
+
+
+Start Tweaking Strips Actions (Lower Stack)
+===========================================
+
+.. reference::
+
+ :Menu: :menuselection:`Edit --> Start Tweaking Strips Actions (Lower Stack)`
+ :Shortcut: :kbd:`Tab`
+
+The contents of Action strips can be edited, but you must be in *Tweak Mode* to do so.
+The keyframes of the action can then be edited in the Dope Sheet.
+
+When you finished editing the strip, simply go to :menuselection:`Edit --> Stop Tweaking Strips Actions`
+or press :kbd:`Tab`.
Copied: trunk/blender_docs/manual/editors/video_sequencer/sequencer/channels.rst (from rev 9350, branches/blender-3.2-release/blender_docs/manual/editors/video_sequencer/sequencer/channels.rst)
===================================================================
--- trunk/blender_docs/manual/editors/video_sequencer/sequencer/channels.rst (rev 0)
+++ trunk/blender_docs/manual/editors/video_sequencer/sequencer/channels.rst 2022-06-08 03:23:08 UTC (rev 9351)
@@ -0,0 +1,40 @@
+
+********
+Channels
+********
+
+Channels are horizontal tracks of along the timeline that contain content called Strips.
+A strip can be an image, animation, or any number of effects.
+Each channel is numbered consecutively on the Y axis,
+starting from 1 and allows up to 128 total channels.
+The X axis of each channel represents time. Each channel can contain as many strips
+as it needs along the time axis as long as they do not overlap. If a strip needs to overlap another,
+it needs to be placed on a channel above or below the other strip.
+
+
+.. _bpy.types.SequenceTimelineChannel:
+
+Channel Region
+==============
+
+The Channel region can be found on the left side of the timeline.
+It is used to organize channels and control channels as a whole.
+The visibility of this region can be toggled with :menuselection:`View --> Channels`
+
+.. _bpy.types.SequenceTimelineChannel.name:
+
+Name
+ The name of the channel,
+ this can be changed to help with project organization by double clicking on the name.
+
+.. _bpy.types.SequenceTimelineChannel.mute:
+
+Mute Channel
+ Disable all the strips in the channel from having an affect on the render.
+ Note that individual strips can also be muted which is different than muting the whole channel.
+
+.. _bpy.types.SequenceTimelineChannel.lock:
+
+Lock Channel
+ Prevent any modifications the strips in the channel.
+ Note that individual strips can also be locked which is different than locking the whole channel.
Modified: trunk/blender_docs/manual/editors/video_sequencer/sequencer/index.rst
===================================================================
--- trunk/blender_docs/manual/editors/video_sequencer/sequencer/index.rst 2022-06-08 03:22:00 UTC (rev 9350)
+++ trunk/blender_docs/manual/editors/video_sequencer/sequencer/index.rst 2022-06-08 03:23:08 UTC (rev 9351)
@@ -18,7 +18,7 @@
:maxdepth: 2
introduction.rst
+ navigating.rst
display.rst
toolbar/index.rst
- navigating.rst
sidebar/index.rst
Modified: trunk/blender_docs/manual/editors/video_sequencer/sequencer/introduction.rst
===================================================================
--- trunk/blender_docs/manual/editors/video_sequencer/sequencer/introduction.rst 2022-06-08 03:22:00 UTC (rev 9350)
+++ trunk/blender_docs/manual/editors/video_sequencer/sequencer/introduction.rst 2022-06-08 03:23:08 UTC (rev 9351)
@@ -3,7 +3,12 @@
Introduction
************
-The Sequencer region is horizontally divided into channels,
+This Sequencer view is where strips can be :doc:`selected </video_editing/edit/montage/selecting>`,
+:doc:`modified </video_editing/edit/montage/editing>` by moving, cutting, or extending strips.
+There are also several built-in :doc:`effects </video_editing/edit/montage/strips/effects/index>`
+that can be combined with other strips to change their appearance.
+
+The Sequencer view is horizontally divided into :doc:`Channels </editors/video_sequencer/sequencer/channels>`
each channel can contain what is called a strip.
A strip can be an image, animation, or any number of effects.
Each channel is numbered consecutively on the Y axis,
@@ -19,8 +24,3 @@
The first channel 0 is unusable as a place to put strips.
This is because it is used by the :doc:`Sequencer Display </editors/video_sequencer/preview/introduction>`
to show a composite of all strips above channel 0.
-
-This region is where strips can be :doc:`selected </video_editing/edit/montage/selecting>`,
-:doc:`modified </video_editing/edit/montage/editing>` by moving, cutting, or extending strips.
-There are also several built-in :doc:`effects </video_editing/edit/montage/strips/effects/index>`
-that can be combined with other strips to change their appearance.
Modified: trunk/blender_docs/manual/editors/video_sequencer/sequencer/navigating.rst
===================================================================
--- trunk/blender_docs/manual/editors/video_sequencer/sequencer/navigating.rst 2022-06-08 03:22:00 UTC (rev 9350)
+++ trunk/blender_docs/manual/editors/video_sequencer/sequencer/navigating.rst 2022-06-08 03:23:08 UTC (rev 9351)
@@ -26,6 +26,8 @@
Adjust Last Operation
Displays a pop-up panel to alter properties of the last
completed operation. See :ref:`bpy.ops.screen.redo_last`.
+Channels
+ Show or hide the :ref:`bpy.types.SequenceTimelineChannel`.
Preview as Backdrop
Displays the current frame in the background of the main view like in the Compositor.
Modified: trunk/blender_docs/manual/glossary/index.rst
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-docboard-svn
mailing list