Skip to content
GitLab
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
a29ab984
Commit
a29ab984
authored
Feb 07, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix error in importing keyframes from clipboard
Related to
#554
parent
7f8a64a5
Pipeline
#14641
passed with stage
in 18 minutes and 6 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/assets/view/widgets/keyframeimport.cpp
View file @
a29ab984
...
...
@@ -219,7 +219,8 @@ KeyframeImport::KeyframeImport(const QString &animData, std::shared_ptr<AssetPar
lay
->
addLayout
(
l1
);
// Output offset
m_offsetPoint
=
new
PositionWidget
(
i18n
(
"Offset"
),
0
,
0
,
out
,
pCore
->
currentDoc
()
->
timecode
(),
""
,
this
);
int
clipIn
=
m_model
->
data
(
indexes
.
first
(),
AssetParameterModel
::
ParentInRole
).
toInt
();
m_offsetPoint
=
new
PositionWidget
(
i18n
(
"Offset"
),
clipIn
,
0
,
clipIn
+
m_model
->
data
(
indexes
.
first
(),
AssetParameterModel
::
ParentDurationRole
).
toInt
(),
pCore
->
currentDoc
()
->
timecode
(),
""
,
this
);
lay
->
addWidget
(
m_offsetPoint
);
// Source range
...
...
@@ -654,7 +655,6 @@ void KeyframeImport::importSelectedData()
KeyframeModel
*
km
=
kfrModel
->
getKeyModel
(
ix
);
qDebug
()
<<
"== "
<<
ix
<<
" = "
<<
m_targetCombo
->
currentData
().
toModelIndex
();
if
(
ix
==
m_targetCombo
->
currentData
().
toModelIndex
())
{
qDebug
()
<<
"= = =
\n\n
PROCESSING KF IMPORT LOP: "
<<
anim
->
key_count
()
<<
"
\n\n
==="
;
// Import our keyframes
int
frame
=
0
;
KeyframeImport
::
ImportRoles
convertMode
=
static_cast
<
KeyframeImport
::
ImportRoles
>
(
m_sourceCombo
->
currentData
().
toInt
());
...
...
src/bin/bin.cpp
View file @
a29ab984
...
...
@@ -2895,6 +2895,9 @@ void Bin::switchTag(const QString &tag, bool add)
// Check for folders
QList
<
QString
>
allClips
;
for
(
const
QModelIndex
&
ix
:
indexes
)
{
if
(
!
ix
.
isValid
()
||
ix
.
column
()
!=
0
)
{
continue
;
}
std
::
shared_ptr
<
AbstractProjectItem
>
parentItem
=
m_itemModel
->
getBinItemByIndex
(
m_proxyModel
->
mapToSource
(
ix
));
if
(
parentItem
->
itemType
()
==
AbstractProjectItem
::
FolderItem
)
{
QList
<
std
::
shared_ptr
<
ProjectClip
>>
children
=
std
::
static_pointer_cast
<
ProjectFolder
>
(
parentItem
)
->
childClips
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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