Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-12-28 15:37:51 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-12-28 16:08:02 +0300
commit3610f1fc43d0f56dfa7cf2eed39e6470eedb8f3e (patch)
treef417ad85a932022926be20f45d8899a1c48950f3 /source/blender/blenkernel/intern/seqeffects.c
parenta4e4d9f0ab89610df5bf1bbb0252e9130353b7fd (diff)
Sequencer: refactor clipboard copy to no longer increase user count.
The clipboard is not a real user and should not be counted. Only on paste should the user count increase. This is part of D3621, and was implemented by Richard Antalik and me.
Diffstat (limited to 'source/blender/blenkernel/intern/seqeffects.c')
-rw-r--r--source/blender/blenkernel/intern/seqeffects.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index d5e32ac7e39..193db2b623f 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -751,7 +751,7 @@ static void load_gammacross(Sequence *UNUSED(seq))
{
}
-static void free_gammacross(Sequence *UNUSED(seq))
+static void free_gammacross(Sequence *UNUSED(seq), const bool UNUSED(do_id_user))
{
}
@@ -1805,7 +1805,7 @@ static int num_inputs_wipe(void)
return 2;
}
-static void free_wipe_effect(Sequence *seq)
+static void free_wipe_effect(Sequence *seq, const bool UNUSED(do_id_user))
{
if (seq->effectdata)
MEM_freeN(seq->effectdata);
@@ -1813,7 +1813,7 @@ static void free_wipe_effect(Sequence *seq)
seq->effectdata = NULL;
}
-static void copy_wipe_effect(Sequence *dst, Sequence *src)
+static void copy_wipe_effect(Sequence *dst, Sequence *src, const int UNUSED(flag))
{
dst->effectdata = MEM_dupallocN(src->effectdata);
}
@@ -1996,13 +1996,13 @@ static int num_inputs_transform(void)
return 1;
}
-static void free_transform_effect(Sequence *seq)
+static void free_transform_effect(Sequence *seq, const bool UNUSED(do_id_user))
{
if (seq->effectdata) MEM_freeN(seq->effectdata);
seq->effectdata = NULL;
}
-static void copy_transform_effect(Sequence *dst, Sequence *src)
+static void copy_transform_effect(Sequence *dst, Sequence *src, const int UNUSED(flag))
{
dst->effectdata = MEM_dupallocN(src->effectdata);
}
@@ -2314,7 +2314,7 @@ static int num_inputs_glow(void)
return 1;
}
-static void free_glow_effect(Sequence *seq)
+static void free_glow_effect(Sequence *seq, const bool UNUSED(do_id_user))
{
if (seq->effectdata)
MEM_freeN(seq->effectdata);
@@ -2322,7 +2322,7 @@ static void free_glow_effect(Sequence *seq)
seq->effectdata = NULL;
}
-static void copy_glow_effect(Sequence *dst, Sequence *src)
+static void copy_glow_effect(Sequence *dst, Sequence *src, const int UNUSED(flag))
{
dst->effectdata = MEM_dupallocN(src->effectdata);
}
@@ -2408,7 +2408,7 @@ static int num_inputs_color(void)
return 0;
}
-static void free_solid_color(Sequence *seq)
+static void free_solid_color(Sequence *seq, const bool UNUSED(do_id_user))
{
if (seq->effectdata)
MEM_freeN(seq->effectdata);
@@ -2416,7 +2416,7 @@ static void free_solid_color(Sequence *seq)
seq->effectdata = NULL;
}
-static void copy_solid_color(Sequence *dst, Sequence *src)
+static void copy_solid_color(Sequence *dst, Sequence *src, const int UNUSED(flag))
{
dst->effectdata = MEM_dupallocN(src->effectdata);
}
@@ -2664,7 +2664,7 @@ static int num_inputs_speed(void)
return 1;
}
-static void free_speed_effect(Sequence *seq)
+static void free_speed_effect(Sequence *seq, const bool UNUSED(do_id_user))
{
SpeedControlVars *v = (SpeedControlVars *)seq->effectdata;
if (v->frameMap)
@@ -2674,7 +2674,7 @@ static void free_speed_effect(Sequence *seq)
seq->effectdata = NULL;
}
-static void copy_speed_effect(Sequence *dst, Sequence *src)
+static void copy_speed_effect(Sequence *dst, Sequence *src, const int UNUSED(flag))
{
SpeedControlVars *v;
dst->effectdata = MEM_dupallocN(src->effectdata);
@@ -2889,7 +2889,7 @@ static int num_inputs_gaussian_blur(void)
return 1;
}
-static void free_gaussian_blur_effect(Sequence *seq)
+static void free_gaussian_blur_effect(Sequence *seq, const bool UNUSED(do_id_user))
{
if (seq->effectdata)
MEM_freeN(seq->effectdata);
@@ -2897,7 +2897,7 @@ static void free_gaussian_blur_effect(Sequence *seq)
seq->effectdata = NULL;
}
-static void copy_gaussian_blur_effect(Sequence *dst, Sequence *src)
+static void copy_gaussian_blur_effect(Sequence *dst, Sequence *src, const int UNUSED(flag))
{
dst->effectdata = MEM_dupallocN(src->effectdata);
}
@@ -3503,7 +3503,7 @@ static void load_noop(Sequence *UNUSED(seq))
}
-static void free_noop(Sequence *UNUSED(seq))
+static void free_noop(Sequence *UNUSED(seq), const bool UNUSED(do_id_user))
{
}
@@ -3513,12 +3513,12 @@ static int num_inputs_default(void)
return 2;
}
-static void copy_effect_default(Sequence *dst, Sequence *src)
+static void copy_effect_default(Sequence *dst, Sequence *src, const int UNUSED(flag))
{
dst->effectdata = MEM_dupallocN(src->effectdata);
}
-static void free_effect_default(Sequence *seq)
+static void free_effect_default(Sequence *seq, const bool UNUSED(do_id_user))
{
if (seq->effectdata)
MEM_freeN(seq->effectdata);