griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: remove unused arguments, quiet unused assignment warning

Browse Source
This commit is contained in:
Campbell Barton
2024-11-06 21:35:07 +11:00
parent 0d4ce60772
commit 273bccb108
5 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/grease_pencil_vertex_groups.cc
View File

@@ -95,7 +95,7 @@ void assign_to_vertex_group_from_mask(bke::CurvesGeometry &curves,
});
}
void assign_to_vertex_group(GreasePencil &grease_pencil,
void assign_to_vertex_group(GreasePencil & /*grease_pencil*/,
Drawing &drawing,
const StringRef name,
const float weight)
@@ -190,7 +190,7 @@ void clear_vertex_groups(GreasePencil &grease_pencil)
}
}
void select_from_group(GreasePencil &grease_pencil,
void select_from_group(GreasePencil & /*grease_pencil*/,
Drawing &drawing,
const AttrDomain selection_domain,
const StringRef name,

2
source/blender/editors/space_sequencer/sequencer_retiming.cc
View File

@@ -445,7 +445,7 @@ static bool transition_add_new_for_seq(const bContext *C,
return false;
}
SeqRetimingKey *transition = SEQ_retiming_add_transition(scene, seq, key, duration);
SeqRetimingKey *transition = SEQ_retiming_add_transition(seq, key, duration);
if (transition == nullptr) {
BKE_report(op->reports, RPT_WARNING, "Cannot create transition");

2
source/blender/makesrna/intern/rna_sequencer.cc
View File

@@ -383,7 +383,7 @@ static void rna_Sequence_retiming_key_remove(ID *id, SeqRetimingKey *key)
return;
}
SEQ_retiming_remove_key(scene, seq, key);
SEQ_retiming_remove_key(seq, key);
SEQ_relations_invalidate_cache_raw(scene, seq);
WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, nullptr);

7
source/blender/sequencer/SEQ_retiming.hh
View File

@@ -30,17 +30,14 @@ bool SEQ_retiming_is_allowed(const Sequence *seq);
* become invalid.
*/
SeqRetimingKey *SEQ_retiming_add_key(const Scene *scene, Sequence *seq, int timeline_frame);
SeqRetimingKey *SEQ_retiming_add_transition(const Scene *scene,
Sequence *seq,
SeqRetimingKey *key,
float offset);
SeqRetimingKey *SEQ_retiming_add_transition(Sequence *seq, SeqRetimingKey *key, float offset);
SeqRetimingKey *SEQ_retiming_add_freeze_frame(const Scene *scene,
Sequence *seq,
SeqRetimingKey *key,
const int offset);
bool SEQ_retiming_is_last_key(const Sequence *seq, const SeqRetimingKey *key);
SeqRetimingKey *SEQ_retiming_last_key_get(const Sequence *seq);
void SEQ_retiming_remove_key(const Scene *scene, Sequence *seq, SeqRetimingKey *key);
void SEQ_retiming_remove_key(Sequence *seq, SeqRetimingKey *key);
void SEQ_retiming_transition_key_frame_set(const Scene *scene,
const Sequence *seq,
SeqRetimingKey *key,

33
source/blender/sequencer/intern/strip_retiming.cc
View File

@@ -295,7 +295,7 @@ float seq_retiming_evaluate(const Sequence *seq, const float frame_index)
return std::min(1.0f, seq_retiming_evaluate_arc_segment(start_key, frame_index));
}
static SeqRetimingKey *seq_retiming_add_key(const Scene *scene, Sequence *seq, float frame_index)
static SeqRetimingKey *seq_retiming_add_key(Sequence *seq, float frame_index)
{
/* Clamp timeline frame to strip content range. */
if (frame_index <= 0) {
@@ -352,7 +352,7 @@ SeqRetimingKey *SEQ_retiming_add_key(const Scene *scene, Sequence *seq, const in
const float frame_index = (timeline_frame - SEQ_time_start_frame_get(seq) - sound_offset) *
SEQ_time_media_playback_rate_factor_get(scene, seq);
return seq_retiming_add_key(scene, seq, frame_index);
return seq_retiming_add_key(seq, frame_index);
}
void SEQ_retiming_transition_key_frame_set(const Scene *scene,
@@ -480,9 +480,7 @@ static void seq_retiming_remove_key_ex(Sequence *seq, SeqRetimingKey *key)
}
/* This function removes transition segment and creates retiming key where it originally was. */
static SeqRetimingKey *seq_retiming_remove_transition(const Scene *scene,
Sequence *seq,
SeqRetimingKey *key)
static SeqRetimingKey *seq_retiming_remove_transition(Sequence *seq, SeqRetimingKey *key)
{
SeqRetimingKey *transition_start = key;
if ((key->flag & SEQ_SPEED_TRANSITION_OUT) != 0) {
@@ -498,16 +496,16 @@ static SeqRetimingKey *seq_retiming_remove_transition(const Scene *scene,
seq_retiming_remove_key_ex(seq, seq->retiming_keys + key_index);
/* Create original linear key. */
SeqRetimingKey *orig_key = seq_retiming_add_key(scene, seq, orig_frame_index);
SeqRetimingKey *orig_key = seq_retiming_add_key(seq, orig_frame_index);
orig_key->retiming_factor = orig_retiming_factor;
return orig_key;
}
void SEQ_retiming_remove_key(const Scene *scene, Sequence *seq, SeqRetimingKey *key)
void SEQ_retiming_remove_key(Sequence *seq, SeqRetimingKey *key)
{
if (SEQ_retiming_key_is_transition_type(key)) {
seq_retiming_remove_transition(scene, seq, key);
seq_retiming_remove_transition(seq, key);
return;
}
@@ -558,10 +556,7 @@ SeqRetimingKey *SEQ_retiming_add_freeze_frame(const Scene *scene,
return new_key + 1;
}
SeqRetimingKey *SEQ_retiming_add_transition(const Scene *scene,
Sequence *seq,
SeqRetimingKey *key,
float offset)
SeqRetimingKey *SEQ_retiming_add_transition(Sequence *seq, SeqRetimingKey *key, float offset)
{
BLI_assert(!SEQ_retiming_is_last_key(seq, key));
BLI_assert(key->strip_frame_index != 0);
@@ -583,12 +578,10 @@ SeqRetimingKey *SEQ_retiming_add_transition(const Scene *scene,
const int orig_frame_index = key->strip_frame_index;
const float orig_retiming_factor = key->retiming_factor;
SeqRetimingKey *transition_out = seq_retiming_add_key(
scene, seq, orig_frame_index + clamped_offset);
SeqRetimingKey *transition_out = seq_retiming_add_key(seq, orig_frame_index + clamped_offset);
transition_out->flag |= SEQ_SPEED_TRANSITION_OUT;
SeqRetimingKey *transition_in = seq_retiming_add_key(
scene, seq, orig_frame_index - clamped_offset);
SeqRetimingKey *transition_in = seq_retiming_add_key(seq, orig_frame_index - clamped_offset);
transition_in->flag |= SEQ_SPEED_TRANSITION_IN;
transition_in->original_strip_frame_index = orig_frame_index;
transition_in->original_retiming_factor = orig_retiming_factor;
@@ -901,11 +894,11 @@ static void seq_retiming_transition_offset(const Scene *scene,
const float duration = (key->original_strip_frame_index - key->strip_frame_index);
const bool was_selected = SEQ_retiming_selection_contains(SEQ_editing_get(scene), key);
SeqRetimingKey *original_key = seq_retiming_remove_transition(scene, seq, key);
SeqRetimingKey *original_key = seq_retiming_remove_transition(seq, key);
original_key->strip_frame_index += clamped_offset *
SEQ_time_media_playback_rate_factor_get(scene, seq);
SeqRetimingKey *transition_out = SEQ_retiming_add_transition(scene, seq, original_key, duration);
SeqRetimingKey *transition_out = SEQ_retiming_add_transition(seq, original_key, duration);
if (was_selected) {
SEQ_retiming_selection_append(transition_out);
@@ -952,8 +945,8 @@ static void seq_retiming_fix_transition(const Scene *scene, Sequence *seq, SeqRe
const int keys_num = seq->retiming_keys_num;
const float transition_duration = (key->original_strip_frame_index - key->strip_frame_index);
SeqRetimingKey *orig_key = seq_retiming_remove_transition(scene, seq, key);
SEQ_retiming_add_transition(scene, seq, orig_key, transition_duration);
SeqRetimingKey *orig_key = seq_retiming_remove_transition(seq, key);
SEQ_retiming_add_transition(seq, orig_key, transition_duration);
BLI_assert(keys_num == seq->retiming_keys_num);
UNUSED_VARS_NDEBUG(keys_num);
}