Skip to content

Commit 8418a37

Browse files
authored
Merge pull request #5543 from OpenShot/release-20240619
Release PR for version 3.2.0
2 parents 54671e2 + 47e8755 commit 8418a37

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+19322
-18040
lines changed

doc/effects.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ impossible or impractical to shoot in.
316316
Property Name Description
317317
========================== ============
318318
color ``(color)`` The color to match
319-
fuzz ``(float, 0 to 125)`` The fuzz factor (or threshold)
319+
threshold ``(float, 0 to 125)`` The threshold (or fuzz factor) for matching similar colors. The larger the value the more colors that will be matched.
320320
halo ``(float, 0 to 125)`` The additional threshold for halo elimination.
321321
keymethod ``(int, choices: ['Basic keying', 'HSV/HSL hue', 'HSV saturation', 'HSL saturation', 'HSV value', 'HSL luminance', 'LCH luminosity', 'LCH chroma', 'LCH hue', 'CIE Distance', 'Cb,Cr vector'])`` The keying method or algorithm to use.
322322
========================== ============

doc/transitions.rst

+11-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ overlap two clips, and can be added manually by dragging one onto the timeline f
2828
A transition must be placed on top of a clip (overlapping it), with the most common location being the beginning or end
2929
or a clip.
3030

31-
NOTE: Transitions **do not** affect **audio**, so if you are intending to fade in/out the
32-
audio volume of a clip, you must adjust the ``volume`` clip property. See :ref:`clip_properties_ref`.
31+
NOTE: Transitions **do not** affect **audio**, so if you are intending to fade in/out the audio volume of a clip,
32+
you must adjust the ``volume`` clip property. See :ref:`clip_properties_ref`
3333

3434
Overview
3535
--------
@@ -52,6 +52,15 @@ direction of the fade. You can also manually adjust the **Brightness** curve, an
5252

5353
.. image:: images/transition-reverse.jpg
5454

55+
Transparency
56+
------------
57+
If transitions are used on images or videos that contain transparency (*i.e. alpha channel*) this will result in the
58+
original clip disappearing abruptly (or popping out of existence), since OpenShot's transition system expects the 2nd
59+
clip to fully cover up the first clip. For example, if the 2nd clip does not fully cover the first clip,
60+
a transition might not be the best tool to use. Instead, you should consider adjusting the ``alpha`` property of the first
61+
clip to make it fade out where needed, see :ref:`clip_properties_ref` or :ref:`clip_presets_ref`. Alternatively, you can
62+
combine a transition and ``alpha`` fade when using transparent clips to more smoothly fade between then.
63+
5564
Cutting & Slicing
5665
-----------------
5766
OpenShot has many easy ways to adjust the start and end trim positions of a transition (otherwise known as cutting or trimming). The most common
Loading
Loading
Loading
Loading
Loading

images/openshot.qrc

+5
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@
5656
<file>Humanity/actions/custom/snap.svg</file>
5757
<file>Humanity/actions/custom/center-on-playhead.svg</file>
5858
<file>Humanity/actions/custom/camera-photo-symbolic.svg</file>
59+
<file>Humanity/actions/custom/paypal-icon.svg</file>
60+
<file>Humanity/actions/custom/discord-icon.svg</file>
61+
<file>Humanity/actions/custom/launchpad-icon.svg</file>
62+
<file>Humanity/actions/custom/github-icon.svg</file>
63+
<file>Humanity/actions/custom/reddit-icon.svg</file>
5964
<file>Humanity/mimes/16/font-x-generic.svg</file>
6065
<file>Humanity/mimes/16/video-x-generic.svg</file>
6166
<file>Humanity/status/16/dialog-error.svg</file>

0 commit comments

Comments
 (0)