projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add preset mask shapes, add ctr/nrml btns, new igor icons, enables apply to mask...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
maskauto.C
diff --git
a/cinelerra-5.1/cinelerra/maskauto.C
b/cinelerra-5.1/cinelerra/maskauto.C
index 3ddd946338219262d1fa0ec699109ca8832ad394..e490f4c854334bf259f9a1bc4958ebabe2cef1e6 100644
(file)
--- a/
cinelerra-5.1/cinelerra/maskauto.C
+++ b/
cinelerra-5.1/cinelerra/maskauto.C
@@
-96,10
+96,12
@@
int SubMask::operator==(SubMask& ptr)
return equivalent(ptr);
}
return equivalent(ptr);
}
-void SubMask::copy_from(SubMask& ptr)
+void SubMask::copy_from(SubMask& ptr
, int do_name
)
{
{
- memset(name, 0, sizeof(name));
- strncpy(name, ptr.name, sizeof(name-1));
+ if( do_name ) {
+ memset(name, 0, sizeof(name));
+ strncpy(name, ptr.name, sizeof(name-1));
+ }
fader = ptr.fader;
feather = ptr.feather;
points.remove_all_objects();
fader = ptr.fader;
feather = ptr.feather;
points.remove_all_objects();
@@
-140,7
+142,8
@@
void SubMask::copy(FileXML *file)
if(points.total)
{
file->tag.set_title("MASK");
if(points.total)
{
file->tag.set_title("MASK");
- file->tag.set_property("NUMBER", keyframe->masks.number_of(this));
+ file->tag.set_property("NUMBER",
+ !keyframe ? -1 : keyframe->masks.number_of(this));
file->tag.set_property("NAME", name);
file->tag.set_property("FADER", fader);
file->tag.set_property("FEATHER", feather);
file->tag.set_property("NAME", name);
file->tag.set_property("FADER", fader);
file->tag.set_property("FEATHER", feather);