projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update ffmpeg mpegtsenc bluray patch, tweak asset equivalent for batchrender warn...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
maskautos.C
diff --git
a/cinelerra-5.1/cinelerra/maskautos.C
b/cinelerra-5.1/cinelerra/maskautos.C
index 3e736f1e73bad75b961fa1f327e338d051502cde..bac0d851d965301f13508d3454e565a952d54f27 100644
(file)
--- a/
cinelerra-5.1/cinelerra/maskautos.C
+++ b/
cinelerra-5.1/cinelerra/maskautos.C
@@
-22,6
+22,7
@@
#include "automation.inc"
#include "clip.h"
#include "edl.h"
#include "automation.inc"
#include "clip.h"
#include "edl.h"
+#include "edlsession.h"
#include "localsession.h"
#include "maskauto.h"
#include "maskautos.h"
#include "localsession.h"
#include "maskauto.h"
#include "maskautos.h"
@@
-50,7
+51,8
@@
void MaskAutos::update_parameter(MaskAuto *src)
// Selection is always aligned to frame for masks
// Create new keyframe if auto keyframes or replace entire keyframe.
// Selection is always aligned to frame for masks
// Create new keyframe if auto keyframes or replace entire keyframe.
- if(selection_start == selection_end)
+ if( !edl->session->span_keyframes ||
+ EQUIV(selection_start, selection_end) )
{
// Search for keyframe to write to
MaskAuto *dst = (MaskAuto*)get_auto_for_editing();
{
// Search for keyframe to write to
MaskAuto *dst = (MaskAuto*)get_auto_for_editing();
@@
-88,7
+90,7
@@
void MaskAutos::update_parameter(MaskAuto *src)
-void MaskAutos::get_points(
ArrayList<MaskPoint*>
*points,
+void MaskAutos::get_points(
MaskPoints
*points,
int submask,
int64_t position,
int direction)
int submask,
int64_t position,
int direction)