Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
252
Issues
252
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
1151ca57
Commit
1151ca57
authored
Jun 27, 2019
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
src/assets/keyframes/model/keyframemodel.cpp
src/assets/keyframes/model/keyframemodel.cpp
+2
-0
src/core.cpp
src/core.cpp
+2
-0
src/timeline2/model/clipmodel.cpp
src/timeline2/model/clipmodel.cpp
+2
-2
No files found.
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
Markdown
is supported
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