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

Aaron Carlisle noreply at blender.org
Sat Feb 20 00:52:51 CET 2021 

Revision: 7767
          https://developer.blender.org/rBM7767
Author:   Blendify
Date:     2021-02-20 00:52:51 +0100 (Sat, 20 Feb 2021)
Log Message:
-----------
Merge branch 'blender-2.92-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/editors/preferences/input.rst
    trunk/blender_docs/manual/editors/properties_editor.rst
    trunk/blender_docs/manual/video_editing/preview/introduction.rst
    trunk/blender_docs/manual/video_editing/sequencer/navigating.rst
    trunk/blender_docs/manual/video_editing/sequencer/sidebar/strip.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-02-19 23:37:23 UTC (rev 7766)
+++ trunk/blender_docs	2021-02-19 23:52:51 UTC (rev 7767)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/branches/blender-2.92-release/blender_docs:7610-7760
\ No newline at end of property
+/branches/blender-2.92-release/blender_docs:7610-7766
\ No newline at end of property
Modified: trunk/blender_docs/manual/editors/preferences/input.rst
===================================================================
--- trunk/blender_docs/manual/editors/preferences/input.rst	2021-02-19 23:37:23 UTC (rev 7766)
+++ trunk/blender_docs/manual/editors/preferences/input.rst	2021-02-19 23:52:51 UTC (rev 7767)
@@ -104,6 +104,7 @@
    Select the native Windows Ink or older Wintab system for pressure sensitivity.
    Blender automatically selects the API for your operating system and tablet,
    however in case of problems this can be set manually.
+   You may need to restart Blender for changes to take affect.
 Max Threshold
    Amount of pressure required to achieve full intensity.
 Softness

Modified: trunk/blender_docs/manual/editors/properties_editor.rst
===================================================================
--- trunk/blender_docs/manual/editors/properties_editor.rst	2021-02-19 23:37:23 UTC (rev 7766)
+++ trunk/blender_docs/manual/editors/properties_editor.rst	2021-02-19 23:52:51 UTC (rev 7767)
@@ -141,6 +141,6 @@
    Sync tabs with the Outliner data-block selection.
    See :ref:`editors-outliner-properties-sync` for more information.
 
-   :On: Always sync from Outliner editors to this editor.
-   :Off: Never sync from Outliner editors to this editor.
-   :Auto: Sync when this editor shares an area edge with an Outliner editor.
+   :Always: Always, when possible, change Property editor tabs when clicking an icon in an outliner.
+   :Never: Never change Property editor tabs when clicking an icon in an outliner.
+   :Auto: Change tabs only when the Property editor editor shares a border with a outliner.

Modified: trunk/blender_docs/manual/video_editing/preview/introduction.rst
===================================================================
--- trunk/blender_docs/manual/video_editing/preview/introduction.rst	2021-02-19 23:37:23 UTC (rev 7766)
+++ trunk/blender_docs/manual/video_editing/preview/introduction.rst	2021-02-19 23:52:51 UTC (rev 7767)
@@ -31,16 +31,6 @@
 Fractional Zoom
    Resize the preview in steps from 1:8 to 8:1.
 
-Show Frame Overlay
-   Displays the :ref:`Frame Overlay <bpy.types.SequenceEditor.show_overlay>`,
-   to compare the current frame to a reference frame.
-Show Safe Areas
-   Display an overlay on the preview, marking where title safe region is.
-Show Metadata
-   Display Image metadata in the preview area.
-Show Annotations
-   Displays :doc:`Annotations </interface/annotate_tool>` in the preview region.
-
 Sequence Render Image
    Render the an image at the current frame.
 Sequence Render Animation
@@ -82,6 +72,34 @@
    Ignore transparency of preview image (fully transparent areas will be black).
 
 
+Overlays
+--------
+
+Overlays are information that is displayed on top of the preview region.
+There is a switch to turn off/on all overlays for the preview region.
+
+.. rubric:: Preview Overlays
+
+Frame Overlay
+   Displays the :ref:`Frame Overlay <bpy.types.SequenceEditor.show_overlay>`,
+   to compare the current frame to a reference frame.
+
+.. _bpy.types.SpaceSequenceEditor.show_safe_areas:
+
+Safe Areas
+   Display an overlay on the preview, marking where the title safe regions are.
+
+.. _bpy.types.SpaceSequenceEditor.show_metadata:
+
+Metadata
+   Display Image metadata in the preview area.
+
+.. _bpy.types.SpaceSequenceEditor.show_annotation:
+
+Annotations
+   Displays :doc:`Annotations </interface/annotate_tool>` in the preview region.
+
+
 Gizmos
 ======
 

Modified: trunk/blender_docs/manual/video_editing/sequencer/navigating.rst
===================================================================
--- trunk/blender_docs/manual/video_editing/sequencer/navigating.rst	2021-02-19 23:37:23 UTC (rev 7766)
+++ trunk/blender_docs/manual/video_editing/sequencer/navigating.rst	2021-02-19 23:52:51 UTC (rev 7767)
@@ -83,10 +83,6 @@
 
 Show Seconds :kbd:`Ctrl-T`
    Shows seconds instead of frames on the time axis.
-Show Offsets
-   Shows overflow bars of "extra" content from either cutting or sliding strips.
-Show F-Curves
-   Show animation curves for opacity and volume values as darkened sections of the strip.
 Show Markers
    Shows the markers region. When disabled, the `Markers Menu`_ is also hidden
    and markers operators are not available in this editor.
@@ -100,10 +96,6 @@
 
    In order for this property to be visible, enable :ref:`Developer Extras <prefs-interface-dev-extras>`.
 
-Show Waveforms
-   Global option to either display the waveform, or the strip info,
-   or use the individual :ref:`strip option <sequencer-sound-waveform>`.
-
 Sequence Render Image
    Render an image of the current frame.
 Sequence Render Animation
@@ -131,6 +123,50 @@
 For descriptions of the different marker tools see :ref:`Editing Markers <animation-markers-editing>`.
 
 
+Overlays
+--------
+
+Overlays are information that is displayed on top of the strip region.
+There is a switch to turn off/on all overlays for the strip region.
+
+.. rubric:: Sequencer Overlays
+
+.. _bpy.types.SpaceSequenceEditor.show_strip_name:
+
+Name
+   Shows the :ref:`Name <bpy.types.Sequence.name>` on the strip.
+
+.. _bpy.types.SpaceSequenceEditor.show_strip_source:
+
+Source
+   Shows the path to the strip file on the strip.
+
+.. _bpy.types.SpaceSequenceEditor.show_strip_duration:
+
+Duration
+   Shows the length of the strip in frames on the strip.
+
+.. _bpy.types.SpaceSequenceEditor.show_strip_offset:
+
+Offsets
+   Shows overflow bars of "extra" content from either cutting or sliding strips.
+
+.. _bpy.types.SpaceSequenceEditor.show_fcurves:
+
+F-Curves
+   Show animation curves for opacity and volume values as darkened sections of the strip.
+
+.. _bpy.types.SpaceSequenceEditor.waveform_display_type:
+
+Waveform Display
+   Global options for waveform display on sound strips.
+
+   :Waveform Off: Disable waveforms for all strips.
+   :Waveform On: Enable waveforms for all strips.
+   :Use Strip Option: Set waveform per strip configured with
+      :ref:`Display Waveform <bpy.types.SoundSequence.show_waveform>`.
+
+
 Main View
 =========
 

Modified: trunk/blender_docs/manual/video_editing/sequencer/sidebar/strip.rst
===================================================================
--- trunk/blender_docs/manual/video_editing/sequencer/sidebar/strip.rst	2021-02-19 23:37:23 UTC (rev 7766)
+++ trunk/blender_docs/manual/video_editing/sequencer/sidebar/strip.rst	2021-02-19 23:52:51 UTC (rev 7767)
@@ -8,6 +8,9 @@
 
 Type
    Strip type represented by an icon.
+
+.. _bpy.types.Sequence.name:
+
 Name
    You can name or rename your strips here.
 Mute
@@ -130,7 +133,7 @@
    In case of multichannel audio (rear speakers) you can pan to those with the higher values: -2, 2 is back.
    So this value basically represents the angle at which it's played.
 
-.. _sequencer-sound-waveform:
+.. _bpy.types.SoundSequence.show_waveform:
 
 Display Waveform
    Display an approximate waveform of the sound file inside of the sound strip.

More information about the Bf-docboard-svn mailing list