From 9422e4ddcf5c48fc5d525fe66695e90119cf62fb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 13 Jun 2025 00:52:37 +0000 Subject: [PATCH 1/2] CMake: exclude "-Wextra" when removing strict flags Having "extra" warnings caused too many warnings in areas not actively maintained by Blender developers (./extern/ and some of ./intern/). --- build_files/cmake/macros.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 75d680c0cd7..487595b0b0f 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -670,6 +670,7 @@ macro(remove_strict_flags) "-Wshadow" "-Wdouble-promotion" "-Wold-style-definition" + "-Wextra" "-Werror=[^ ]+" "-Werror" ) From 51b1ade20d4ac127045b038775213b7a96de74f8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 13 Jun 2025 10:55:53 +1000 Subject: [PATCH 2/2] Cleanup: spelling in comments --- source/blender/imbuf/movie/intern/movie_write.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/imbuf/movie/intern/movie_write.cc b/source/blender/imbuf/movie/intern/movie_write.cc index 94f34702d5d..5911b9df25c 100644 --- a/source/blender/imbuf/movie/intern/movie_write.cc +++ b/source/blender/imbuf/movie/intern/movie_write.cc @@ -234,7 +234,7 @@ static AVFrame *generate_video_frame(MovieWriter *context, const ImBuf *image) /* Float image: need to split up the image into a planar format, * because `libswscale` does not support RGBA->YUV conversions from * packed float formats. - * Unpremultiply the image if the output format supports alpha, to + * Un-premultiply the image if the output format supports alpha, to * match the format of the byte image. */ BLI_assert_msg(rgb_frame->linesize[1] == linesize_dst && rgb_frame->linesize[2] == linesize_dst &&