archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Fix clang-tidy warnings: [readability-inconsistent-declaration-parameter-name]

Browse Source
This commit is contained in:
Clément Foucault
2022-09-02 20:30:23 +02:00
parent aa781f98bb
commit ccf62df8b6
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/render/RE_pipeline.h
View File

@@ -461,9 +461,9 @@ bool RE_allow_render_generic_object(struct Object *ob);
/******* defined in render_result.c *********/
bool RE_HasCombinedLayer(const RenderResult *res);
bool RE_HasFloatPixels(const RenderResult *res);
bool RE_RenderResult_is_stereo(const RenderResult *res);
bool RE_HasCombinedLayer(const RenderResult *result);
bool RE_HasFloatPixels(const RenderResult *result);
bool RE_RenderResult_is_stereo(const RenderResult *result);
struct RenderView *RE_RenderViewGetById(struct RenderResult *rr, int view_id);
struct RenderView *RE_RenderViewGetByName(struct RenderResult *rr, const char *viewname);

6
source/blender/render/intern/pipeline.cc
View File

@@ -2534,13 +2534,13 @@ void RE_result_load_from_file(RenderResult *result, ReportList *reports, const c
}
}
bool RE_layers_have_name(struct RenderResult *rr)
bool RE_layers_have_name(struct RenderResult *result)
{
switch (BLI_listbase_count_at_most(&rr->layers, 2)) {
switch (BLI_listbase_count_at_most(&result->layers, 2)) {
case 0:
return false;
case 1:
return (((RenderLayer *)rr->layers.first)->name[0] != '\0');
return (((RenderLayer *)result->layers.first)->name[0] != '\0');
default:
return true;
}

16
source/blender/render/intern/render_result.cc
View File

@@ -1134,13 +1134,13 @@ void render_result_rect_get_pixels(RenderResult *rr,
/*************************** multiview functions *****************************/
bool RE_HasCombinedLayer(const RenderResult *rr)
bool RE_HasCombinedLayer(const RenderResult *result)
{
if (rr == nullptr) {
if (result == nullptr) {
return false;
}
const RenderView *rv = static_cast<RenderView *>(rr->views.first);
const RenderView *rv = static_cast<RenderView *>(result->views.first);
if (rv == nullptr) {
return false;
}
@@ -1148,9 +1148,9 @@ bool RE_HasCombinedLayer(const RenderResult *rr)
return (rv->rect32 || rv->rectf);
}
bool RE_HasFloatPixels(const RenderResult *rr)
bool RE_HasFloatPixels(const RenderResult *result)
{
LISTBASE_FOREACH (const RenderView *, rview, &rr->views) {
LISTBASE_FOREACH (const RenderView *, rview, &result->views) {
if (rview->rect32 && !rview->rectf) {
return false;
}
@@ -1159,13 +1159,13 @@ bool RE_HasFloatPixels(const RenderResult *rr)
return true;
}
bool RE_RenderResult_is_stereo(const RenderResult *rr)
bool RE_RenderResult_is_stereo(const RenderResult *result)
{
if (!BLI_findstring(&rr->views, STEREO_LEFT_NAME, offsetof(RenderView, name))) {
if (!BLI_findstring(&result->views, STEREO_LEFT_NAME, offsetof(RenderView, name))) {
return false;
}
if (!BLI_findstring(&rr->views, STEREO_RIGHT_NAME, offsetof(RenderView, name))) {
if (!BLI_findstring(&result->views, STEREO_RIGHT_NAME, offsetof(RenderView, name))) {
return false;
}

12
source/blender/sequencer/intern/sequencer.c
View File

@@ -426,22 +426,22 @@ MetaStack *SEQ_meta_stack_active_get(const Editing *ed)
return ed->metastack.last;
}
void SEQ_meta_stack_set(const Scene *scene, Sequence *seqm)
void SEQ_meta_stack_set(const Scene *scene, Sequence *dst_seq)
{
Editing *ed = SEQ_editing_get(scene);
/* Clear metastack */
BLI_freelistN(&ed->metastack);
if (seqm != NULL) {
if (dst_seq != NULL) {
/* Allocate meta stack in a way, that represents meta hierarchy in timeline. */
seq_meta_stack_alloc(scene, seqm);
Sequence *meta_parent = seqm;
seq_meta_stack_alloc(scene, dst_seq);
Sequence *meta_parent = dst_seq;
while ((meta_parent = seq_sequence_lookup_meta_by_seq(scene, meta_parent))) {
seq_meta_stack_alloc(scene, meta_parent);
}
SEQ_seqbase_active_set(ed, &seqm->seqbase);
SEQ_channels_displayed_set(ed, &seqm->channels);
SEQ_seqbase_active_set(ed, &dst_seq->seqbase);
SEQ_channels_displayed_set(ed, &dst_seq->channels);
}
else {
/* Go to top level, exiting meta strip. */