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:
authorCampbell Barton <campbell@blender.org>2022-06-28 03:13:06 +0300
committerCampbell Barton <campbell@blender.org>2022-06-28 03:13:24 +0300
commit65f4f506404f42ef0e2ad8b089ba82cb1d63f579 (patch)
tree61aa72c7642c02dc1bda3c0a3ae179516dcbbd27
parent7a44f62bdb60b1fb302e7948ef661f076364d3f2 (diff)
Cleanup: compiler warnings, remove unused functions
-rw-r--r--source/blender/blenfont/intern/blf_glyph.c6
-rw-r--r--source/blender/gpu/opengl/gl_framebuffer.hh6
-rw-r--r--source/blender/makesrna/intern/rna_sequencer.c26
-rw-r--r--source/blender/sequencer/intern/sequencer.c2
4 files changed, 8 insertions, 32 deletions
diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c
index bda6c51bf14..63cf3b3e564 100644
--- a/source/blender/blenfont/intern/blf_glyph.c
+++ b/source/blender/blenfont/intern/blf_glyph.c
@@ -682,7 +682,9 @@ static bool blf_glyph_render_bitmap(FontBLF *font, FT_GlyphSlot glyph)
*
* \param factor: -1 (min stroke width) <= 0 (normal) => 1 (max boldness).
*/
-static bool blf_glyph_transform_weight(FT_GlyphSlot glyph, float factor, bool monospaced)
+static bool UNUSED_FUNCTION(blf_glyph_transform_weight)(FT_GlyphSlot glyph,
+ float factor,
+ bool monospaced)
{
if (glyph->format == FT_GLYPH_FORMAT_OUTLINE) {
/* Fake bold if the font does not have this variable axis. */
@@ -711,7 +713,7 @@ static bool blf_glyph_transform_weight(FT_GlyphSlot glyph, float factor, bool mo
*
* \note that left-leaning italics are possible in some RTL writing systems.
*/
-static bool blf_glyph_transform_slant(FT_GlyphSlot glyph, float factor)
+static bool UNUSED_FUNCTION(blf_glyph_transform_slant)(FT_GlyphSlot glyph, float factor)
{
if (glyph->format == FT_GLYPH_FORMAT_OUTLINE) {
FT_Matrix transform = {to_16dot16(1), to_16dot16(factor / 2.0f), 0, to_16dot16(1)};
diff --git a/source/blender/gpu/opengl/gl_framebuffer.hh b/source/blender/gpu/opengl/gl_framebuffer.hh
index 9dcdb5d13cd..224c7a92c0a 100644
--- a/source/blender/gpu/opengl/gl_framebuffer.hh
+++ b/source/blender/gpu/opengl/gl_framebuffer.hh
@@ -78,9 +78,9 @@ class GLFrameBuffer : public FrameBuffer {
const void *clear_value) override;
/* Attachment load-stores are currently no-op's in OpenGL. */
- void attachment_set_loadstore_op(GPUAttachmentType type,
- eGPULoadOp load_action,
- eGPUStoreOp store_action) override{};
+ void attachment_set_loadstore_op(GPUAttachmentType /*type*/,
+ eGPULoadOp /*load_action*/,
+ eGPUStoreOp /*store_action*/) override{};
void read(eGPUFrameBufferBits planes,
eGPUDataFormat format,
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index 1c7ca8656fd..9edf17614c8 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -332,28 +332,6 @@ static void rna_Sequence_start_frame_set(PointerRNA *ptr, int value)
SEQ_relations_invalidate_cache_composite(scene, seq);
}
-static void rna_Sequence_start_frame_final_set(PointerRNA *ptr, int value)
-{
- Sequence *seq = (Sequence *)ptr->data;
- Scene *scene = (Scene *)ptr->owner_id;
-
- SEQ_time_left_handle_frame_set(scene, seq, value);
- SEQ_transform_fix_single_image_seq_offsets(scene, seq);
- do_sequence_frame_change_update(scene, seq);
- SEQ_relations_invalidate_cache_composite(scene, seq);
-}
-
-static void rna_Sequence_end_frame_final_set(PointerRNA *ptr, int value)
-{
- Sequence *seq = (Sequence *)ptr->data;
- Scene *scene = (Scene *)ptr->owner_id;
-
- SEQ_time_right_handle_frame_set(scene, seq, value);
- SEQ_transform_fix_single_image_seq_offsets(scene, seq);
- do_sequence_frame_change_update(scene, seq);
- SEQ_relations_invalidate_cache_composite(scene, seq);
-}
-
static void rna_Sequence_frame_offset_start_set(PointerRNA *ptr, int value)
{
Sequence *seq = (Sequence *)ptr->data;
@@ -1989,8 +1967,6 @@ static void rna_def_sequence(BlenderRNA *brna)
"Start frame displayed in the sequence editor after offsets are applied, setting this is "
"equivalent to moving the handle, not the actual start frame");
/* overlap tests and calc_seq_disp */
- RNA_def_property_int_funcs(prop, NULL, "rna_Sequence_start_frame_final_set", NULL);
- RNA_def_property_editable_func(prop, "rna_Sequence_frame_editable");
RNA_def_property_update(
prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_preprocessed_update");
@@ -2001,8 +1977,6 @@ static void rna_def_sequence(BlenderRNA *brna)
RNA_def_property_ui_text(
prop, "End Frame", "End frame displayed in the sequence editor after offsets are applied");
/* overlap tests and calc_seq_disp */
- RNA_def_property_int_funcs(prop, NULL, "rna_Sequence_end_frame_final_set", NULL);
- RNA_def_property_editable_func(prop, "rna_Sequence_frame_editable");
RNA_def_property_update(
prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_preprocessed_update");
diff --git a/source/blender/sequencer/intern/sequencer.c b/source/blender/sequencer/intern/sequencer.c
index 79549a09c26..3f48e6dafdd 100644
--- a/source/blender/sequencer/intern/sequencer.c
+++ b/source/blender/sequencer/intern/sequencer.c
@@ -435,7 +435,7 @@ void SEQ_meta_stack_set(const Scene *scene, Sequence *seqm)
/* Allocate meta stack in a way, that represents meta hierarchy in timeline. */
seq_meta_stack_alloc(scene, seqm);
Sequence *meta_parent = seqm;
- while (meta_parent = seq_sequence_lookup_meta_by_seq(scene, meta_parent)) {
+ while ((meta_parent = seq_sequence_lookup_meta_by_seq(scene, meta_parent))) {
seq_meta_stack_alloc(scene, meta_parent);
}