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
1151ca57
Commit
1151ca57
authored
Jun 27, 2019
by
Jean-Baptiste Mardelle
Browse files
Fix keyframe corruption on project opening (was creating unexpected keyframe at 0)
parent
a80ff117
Pipeline
#4677
passed with stage
in 23 minutes
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
src/assets/keyframes/model/keyframemodel.cpp
View file @
1151ca57
...
...
@@ -768,6 +768,8 @@ void KeyframeModel::parseAnimProperty(const QString &prop)
out
=
ptr
->
data
(
m_index
,
AssetParameterModel
::
ParentDurationRole
).
toInt
();
ptr
->
passProperties
(
mlt_prop
);
useOpacity
=
ptr
->
data
(
m_index
,
AssetParameterModel
::
OpacityRole
).
toBool
();
}
else
{
qDebug
()
<<
"###################
\n\n
/// ERROR LOCKING MODEL!!! "
;
}
mlt_prop
.
set
(
"key"
,
prop
.
toUtf8
().
constData
());
// This is a fake query to force the animation to be parsed
...
...
src/core.cpp
View file @
1151ca57
...
...
@@ -397,6 +397,8 @@ int Core::getItemIn(const ObjectId &id)
case
ObjectType
::
TimelineClip
:
if
(
m_mainWindow
->
getCurrentTimeline
()
->
controller
()
->
getModel
()
->
isClip
(
id
.
second
))
{
return
m_mainWindow
->
getCurrentTimeline
()
->
controller
()
->
getModel
()
->
getClipIn
(
id
.
second
);
}
else
{
qDebug
()
<<
"// ERROR QUERYING NON CLIP PROPERTIES
\n\n
!!!!!!!!!!!!!!!!!!!!!!!!!!"
;
}
break
;
case
ObjectType
::
TimelineComposition
:
...
...
src/timeline2/model/clipmodel.cpp
View file @
1151ca57
...
...
@@ -111,9 +111,9 @@ int ClipModel::construct(const std::shared_ptr<TimelineModel> &parent, const QSt
}
auto
result
=
binClip
->
giveMasterAndGetTimelineProducer
(
id
,
producer
,
state
);
std
::
shared_ptr
<
ClipModel
>
clip
(
new
ClipModel
(
parent
,
result
.
first
,
binClipId
,
id
,
state
,
speed
));
clip
->
setClipState_lambda
(
state
)();
clip
->
m_effectStack
->
importEffects
(
producer
,
state
,
result
.
second
);
clip
->
setClipState_lambda
(
state
);
parent
->
registerClip
(
clip
);
clip
->
m_effectStack
->
importEffects
(
producer
,
state
,
result
.
second
);
clip
->
m_clipMarkerModel
->
setReferenceModel
(
binClip
->
getMarkerModel
(),
speed
);
return
id
;
}
...
...
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