projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update neophyte, fix mask bezier rotate/scale
[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 74eec3a857bbf549f8d51bef2db2c48d80165de2..831b899db7fead6ef8f87d4d460522dee3716cc1 100644
(file)
--- a/
cinelerra-5.1/cinelerra/maskauto.C
+++ b/
cinelerra-5.1/cinelerra/maskauto.C
@@
-274,22
+274,17
@@
int MaskAuto::identical(MaskAuto *src)
void MaskAuto::update_parameter(MaskAuto *ref, MaskAuto *src)
{
if(src->value != ref->value)
void MaskAuto::update_parameter(MaskAuto *ref, MaskAuto *src)
{
if(src->value != ref->value)
- {
this->value = src->value;
this->value = src->value;
- }
-
if(src->mode != ref->mode)
if(src->mode != ref->mode)
- {
this->mode = src->mode;
this->mode = src->mode;
- }
-
+ if(src->apply_before_plugins != ref->apply_before_plugins)
+ this->apply_before_plugins = src->apply_before_plugins;
+ if(src->disable_opengl_masking != ref->disable_opengl_masking)
+ this->disable_opengl_masking = src->disable_opengl_masking;
if(!EQUIV(src->feather, ref->feather))
if(!EQUIV(src->feather, ref->feather))
- {
this->feather = src->feather;
this->feather = src->feather;
- }
- for(int i = 0; i < masks.size(); i++)
- {
+ for( int i=0; i<masks.size(); ++i ) {
if(!src->get_submask(i)->equivalent(*ref->get_submask(i)))
this->get_submask(i)->copy_from(*src->get_submask(i));
}
if(!src->get_submask(i)->equivalent(*ref->get_submask(i)))
this->get_submask(i)->copy_from(*src->get_submask(i));
}