diff --git a/CMakeLists.txt b/CMakeLists.txt index 16869142c47..6ebfd037c5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1934,7 +1934,7 @@ if(FIRST_RUN) info_cfg_option(WITH_IMAGE_OPENEXR) info_cfg_option(WITH_IMAGE_OPENJPEG) info_cfg_option(WITH_IMAGE_TIFF) - + info_cfg_text("Audio:") info_cfg_option(WITH_CODEC_AVI) info_cfg_option(WITH_CODEC_FFMPEG) diff --git a/scripts/presets/keyconfig/keymap_data/blender_default.py b/scripts/presets/keyconfig/keymap_data/blender_default.py index 96e5bef6078..9b0e5f22ca0 100644 --- a/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -6318,6 +6318,7 @@ def km_sculpt_expand_modal(_params): ]) return keymap + def km_sculpt_mesh_filter_modal_map(_params): items = [] keymap = ( diff --git a/source/blender/blenkernel/intern/pbvh_pixels_copy.hh b/source/blender/blenkernel/intern/pbvh_pixels_copy.hh index 57c1d887cef..c235662663e 100644 --- a/source/blender/blenkernel/intern/pbvh_pixels_copy.hh +++ b/source/blender/blenkernel/intern/pbvh_pixels_copy.hh @@ -21,4 +21,4 @@ void BKE_pbvh_pixels_copy_update(PBVH &pbvh, ImageUser &image_user, const uv_islands::MeshData &mesh_data); -} // namespace blender::bke::pbvh::pixels \ No newline at end of file +} // namespace blender::bke::pbvh::pixels diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index fa4d0261288..1037f820f23 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -265,10 +265,10 @@ set(SRC BLI_math_angle_types.hh BLI_math_axis_angle.hh BLI_math_axis_angle_types.hh - BLI_math_basis_types.hh BLI_math_base.h BLI_math_base.hh BLI_math_base_safe.h + BLI_math_basis_types.hh BLI_math_bits.h BLI_math_boolean.hh BLI_math_color.h diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_shadow_clipmap_clear_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_shadow_clipmap_clear_comp.glsl index bb807a0a29f..bd5560accec 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_shadow_clipmap_clear_comp.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_shadow_clipmap_clear_comp.glsl @@ -10,4 +10,4 @@ void main() tilemaps_clip_buf[index].clip_near = floatBitsToOrderedInt(-FLT_MAX); tilemaps_clip_buf[index].clip_far = floatBitsToOrderedInt(FLT_MAX); } -} \ No newline at end of file +} diff --git a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert_no_geom.glsl b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert_no_geom.glsl index 81e132e6286..760715c8c85 100644 --- a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert_no_geom.glsl +++ b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert_no_geom.glsl @@ -341,4 +341,4 @@ void main(void) default: DISCARD_VERTEX } -} \ No newline at end of file +} diff --git a/source/blender/gpu/tests/memory_layout_test.cc b/source/blender/gpu/tests/memory_layout_test.cc index 55d7f336701..37972f7825d 100644 --- a/source/blender/gpu/tests/memory_layout_test.cc +++ b/source/blender/gpu/tests/memory_layout_test.cc @@ -97,4 +97,4 @@ TEST(std140, fl_vec2) EXPECT_EQ(offset, 16); } -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_descriptor_pools.cc b/source/blender/gpu/vulkan/vk_descriptor_pools.cc index d525cd918e7..9e6042114c1 100644 --- a/source/blender/gpu/vulkan/vk_descriptor_pools.cc +++ b/source/blender/gpu/vulkan/vk_descriptor_pools.cc @@ -114,4 +114,4 @@ void VKDescriptorPools::free(VKDescriptorSet &descriptor_set) descriptor_set.mark_freed(); } -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_descriptor_pools.hh b/source/blender/gpu/vulkan/vk_descriptor_pools.hh index 8e90fafa87b..c5c2617cc3a 100644 --- a/source/blender/gpu/vulkan/vk_descriptor_pools.hh +++ b/source/blender/gpu/vulkan/vk_descriptor_pools.hh @@ -62,4 +62,4 @@ class VKDescriptorPools { bool is_last_pool_active(); void add_new_pool(); }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_state_manager.cc b/source/blender/gpu/vulkan/vk_state_manager.cc index 4e6eb3298bd..c970b3d6748 100644 --- a/source/blender/gpu/vulkan/vk_state_manager.cc +++ b/source/blender/gpu/vulkan/vk_state_manager.cc @@ -56,4 +56,4 @@ void VKStateManager::texture_unpack_row_length_set(uint /*len*/) { } -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_state_manager.hh b/source/blender/gpu/vulkan/vk_state_manager.hh index 4d2643485c1..c1c50d0b62e 100644 --- a/source/blender/gpu/vulkan/vk_state_manager.hh +++ b/source/blender/gpu/vulkan/vk_state_manager.hh @@ -27,4 +27,4 @@ class VKStateManager : public StateManager { void texture_unpack_row_length_set(uint len) override; }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/io/ply/CMakeLists.txt b/source/blender/io/ply/CMakeLists.txt index 12c1d842ab4..980a2c0b4cb 100644 --- a/source/blender/io/ply/CMakeLists.txt +++ b/source/blender/io/ply/CMakeLists.txt @@ -10,10 +10,10 @@ set(INC ../../blenlib ../../bmesh ../../depsgraph + ../../geometry ../../makesdna ../../makesrna ../../windowmanager - ../../geometry ../../../../extern/fmtlib/include ../../../../intern/guardedalloc ) @@ -23,37 +23,37 @@ set(INC_SYS ) set(SRC + exporter/ply_export.cc exporter/ply_export_data.cc exporter/ply_export_header.cc exporter/ply_export_load_plydata.cc - exporter/ply_export.cc + exporter/ply_file_buffer.cc exporter/ply_file_buffer_ascii.cc exporter/ply_file_buffer_binary.cc - exporter/ply_file_buffer.cc + importer/ply_import.cc importer/ply_import_ascii.cc importer/ply_import_binary.cc importer/ply_import_mesh.cc - importer/ply_import.cc IO_ply.cc + exporter/ply_export.hh exporter/ply_export_data.hh exporter/ply_export_header.hh exporter/ply_export_load_plydata.hh - exporter/ply_export.hh + exporter/ply_file_buffer.hh exporter/ply_file_buffer_ascii.hh exporter/ply_file_buffer_binary.hh - exporter/ply_file_buffer.hh + importer/ply_import.hh importer/ply_import_ascii.hh importer/ply_import_binary.hh importer/ply_import_mesh.hh - importer/ply_import.hh IO_ply.h intern/ply_data.hh - intern/ply_functions.hh intern/ply_functions.cc + intern/ply_functions.hh ) set(LIB