diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 9750e5e52a5..42a0dd58660 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -1384,4 +1384,3 @@ macro(windows_process_platform_bundled_libraries library_deps) endforeach() endif() endmacro() - diff --git a/intern/renderdoc_dynload/CMakeLists.txt b/intern/renderdoc_dynload/CMakeLists.txt index 90fa9951975..2989416166d 100644 --- a/intern/renderdoc_dynload/CMakeLists.txt +++ b/intern/renderdoc_dynload/CMakeLists.txt @@ -14,4 +14,4 @@ set(SRC include/renderdoc_api.hh ) -blender_add_lib(bf_intern_renderdoc_dynload "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") \ No newline at end of file +blender_add_lib(bf_intern_renderdoc_dynload "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/blenkernel/intern/vfont.c b/source/blender/blenkernel/intern/vfont.c index 19cfe2a545f..f7a3b18b438 100644 --- a/source/blender/blenkernel/intern/vfont.c +++ b/source/blender/blenkernel/intern/vfont.c @@ -1144,7 +1144,7 @@ static bool vfont_to_curve(Object *ob, /* Set combined style flags for the selected string. Start with all styles then * remove one if ANY characters do not have it. Break out if we've removed them all. */ ef->select_char_info_flag = CU_CHINFO_BOLD | CU_CHINFO_ITALIC | CU_CHINFO_UNDERLINE | - CU_CHINFO_SMALLCAPS; + CU_CHINFO_SMALLCAPS; for (int k = selstart; k <= selend && ef->select_char_info_flag; k++) { info = &custrinfo[k]; ef->select_char_info_flag &= info->flag; diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h index eade4b63dcd..bfa6a692c72 100644 --- a/source/blender/blenlib/BLI_fileops.h +++ b/source/blender/blenlib/BLI_fileops.h @@ -113,7 +113,6 @@ ENUM_OPERATORS(eFileAttributes, FILE_ATTR_HARDLINK); /** \} */ - /* -------------------------------------------------------------------- */ /** \name External File Operations * \{ */ diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c index 126b6bcf25b..d424b2c20c4 100644 --- a/source/blender/blenlib/intern/winstuff.c +++ b/source/blender/blenlib/intern/winstuff.c @@ -9,9 +9,9 @@ #ifdef WIN32 # include +# include # include # include -# include # include "MEM_guardedalloc.h" diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl index 8156166f42f..2147c68de83 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl @@ -103,4 +103,4 @@ uint gbuffer_object_id_f16_unpack(float object_id_packed) bool gbuffer_is_refraction(vec4 gbuffer) { return gbuffer.w < 1.0; -} \ No newline at end of file +} diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 2934c68772f..4aa53f952cc 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -2006,7 +2006,6 @@ static bool file_os_operations_menu_poll(const bContext *C_const, MenuType *UNUS return false; } - void file_external_operations_menu_register(void) { MenuType *mt; diff --git a/source/blender/gpu/metal/mtl_storage_buffer.hh b/source/blender/gpu/metal/mtl_storage_buffer.hh index c565d29bda4..17aabae64f8 100644 --- a/source/blender/gpu/metal/mtl_storage_buffer.hh +++ b/source/blender/gpu/metal/mtl_storage_buffer.hh @@ -3,4 +3,4 @@ /** \file * \ingroup gpu - */ \ No newline at end of file + */ diff --git a/source/blender/gpu/metal/mtl_storage_buffer.mm b/source/blender/gpu/metal/mtl_storage_buffer.mm index c565d29bda4..17aabae64f8 100644 --- a/source/blender/gpu/metal/mtl_storage_buffer.mm +++ b/source/blender/gpu/metal/mtl_storage_buffer.mm @@ -3,4 +3,4 @@ /** \file * \ingroup gpu - */ \ No newline at end of file + */ diff --git a/source/blender/gpu/vulkan/vk_data_conversion.hh b/source/blender/gpu/vulkan/vk_data_conversion.hh index fb63cf9ddd2..1ca3111d49d 100644 --- a/source/blender/gpu/vulkan/vk_data_conversion.hh +++ b/source/blender/gpu/vulkan/vk_data_conversion.hh @@ -49,4 +49,4 @@ void convert_device_to_host(void *dst_buffer, eGPUDataFormat host_format, eGPUTextureFormat device_format); -}; // namespace blender::gpu \ No newline at end of file +}; // namespace blender::gpu diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 698cdc6639a..0701da3b9ff 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -1293,12 +1293,14 @@ static void rna_def_font(BlenderRNA *UNUSED(brna), StructRNA *srna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "is_select_underline", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "editfont->select_char_info_flag", CU_CHINFO_UNDERLINE); + RNA_def_property_boolean_sdna( + prop, NULL, "editfont->select_char_info_flag", CU_CHINFO_UNDERLINE); RNA_def_property_ui_text(prop, "Selected Underline", "Whether the selected text is underlined"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "is_select_smallcaps", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "editfont->select_char_info_flag", CU_CHINFO_SMALLCAPS); + RNA_def_property_boolean_sdna( + prop, NULL, "editfont->select_char_info_flag", CU_CHINFO_SMALLCAPS); RNA_def_property_ui_text(prop, "Selected Smallcaps", "Whether the selected text is small caps"); RNA_def_property_clear_flag(prop, PROP_EDITABLE);