Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
741e4196
Commit
741e4196
authored
Nov 13, 2019
by
Jean-Baptiste Mardelle
Browse files
Fix dragging favorite effect to master
Fix master effectstack keyframe seeking
parent
2e5be9b9
Pipeline
#10305
passed with stage
in 13 minutes and 28 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/mainwindow.cpp
View file @
741e4196
...
...
@@ -361,6 +361,7 @@ void MainWindow::init()
case
ObjectType
::
TimelineTrack
:
case
ObjectType
::
TimelineClip
:
case
ObjectType
::
TimelineComposition
:
case
ObjectType
::
Master
:
getCurrentTimeline
()
->
controller
()
->
setPosition
(
pos
);
break
;
case
ObjectType
::
BinClip
:
...
...
@@ -2644,7 +2645,7 @@ void MainWindow::addEffect(const QString &effectId)
QVariantMap
effectData
;
effectData
.
insert
(
QStringLiteral
(
"kdenlive/effect"
),
effectId
);
pCore
->
window
()
->
getMainTimeline
()
->
controller
()
->
addAsset
(
effectData
);
}
else
if
(
m_assetPanel
->
effectStackOwner
().
first
==
ObjectType
::
TimelineTrack
||
m_assetPanel
->
effectStackOwner
().
first
==
ObjectType
::
BinClip
)
{
}
else
if
(
m_assetPanel
->
effectStackOwner
().
first
==
ObjectType
::
TimelineTrack
||
m_assetPanel
->
effectStackOwner
().
first
==
ObjectType
::
BinClip
||
m_assetPanel
->
effectStackOwner
().
first
==
ObjectType
::
Master
)
{
if
(
!
m_assetPanel
->
addEffect
(
effectId
))
{
pCore
->
displayMessage
(
i18n
(
"Cannot add effect to clip"
),
InformationMessage
);
}
...
...
Louis S.
@louiss
mentioned in issue
#362 (closed)
·
Nov 14, 2019
mentioned in issue
#362 (closed)
mentioned in issue #362
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment