main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
12 changed files with 19 additions and 18 deletions
Showing only changes of commit ecc3e8c751 - Show all commits

View File

@ -1934,7 +1934,7 @@ if(FIRST_RUN)
info_cfg_option(WITH_IMAGE_OPENEXR) info_cfg_option(WITH_IMAGE_OPENEXR)
info_cfg_option(WITH_IMAGE_OPENJPEG) info_cfg_option(WITH_IMAGE_OPENJPEG)
info_cfg_option(WITH_IMAGE_TIFF) info_cfg_option(WITH_IMAGE_TIFF)
info_cfg_text("Audio:") info_cfg_text("Audio:")
info_cfg_option(WITH_CODEC_AVI) info_cfg_option(WITH_CODEC_AVI)
info_cfg_option(WITH_CODEC_FFMPEG) info_cfg_option(WITH_CODEC_FFMPEG)

View File

@ -6318,6 +6318,7 @@ def km_sculpt_expand_modal(_params):
]) ])
return keymap return keymap
def km_sculpt_mesh_filter_modal_map(_params): def km_sculpt_mesh_filter_modal_map(_params):
items = [] items = []
keymap = ( keymap = (

View File

@ -21,4 +21,4 @@ void BKE_pbvh_pixels_copy_update(PBVH &pbvh,
ImageUser &image_user, ImageUser &image_user,
const uv_islands::MeshData &mesh_data); const uv_islands::MeshData &mesh_data);
} // namespace blender::bke::pbvh::pixels } // namespace blender::bke::pbvh::pixels

View File

@ -265,10 +265,10 @@ set(SRC
BLI_math_angle_types.hh BLI_math_angle_types.hh
BLI_math_axis_angle.hh BLI_math_axis_angle.hh
BLI_math_axis_angle_types.hh BLI_math_axis_angle_types.hh
BLI_math_basis_types.hh
BLI_math_base.h BLI_math_base.h
BLI_math_base.hh BLI_math_base.hh
BLI_math_base_safe.h BLI_math_base_safe.h
BLI_math_basis_types.hh
BLI_math_bits.h BLI_math_bits.h
BLI_math_boolean.hh BLI_math_boolean.hh
BLI_math_color.h BLI_math_color.h

View File

@ -10,4 +10,4 @@ void main()
tilemaps_clip_buf[index].clip_near = floatBitsToOrderedInt(-FLT_MAX); tilemaps_clip_buf[index].clip_near = floatBitsToOrderedInt(-FLT_MAX);
tilemaps_clip_buf[index].clip_far = floatBitsToOrderedInt(FLT_MAX); tilemaps_clip_buf[index].clip_far = floatBitsToOrderedInt(FLT_MAX);
} }
} }

View File

@ -341,4 +341,4 @@ void main(void)
default: default:
DISCARD_VERTEX DISCARD_VERTEX
} }
} }

View File

@ -97,4 +97,4 @@ TEST(std140, fl_vec2)
EXPECT_EQ(offset, 16); EXPECT_EQ(offset, 16);
} }
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -114,4 +114,4 @@ void VKDescriptorPools::free(VKDescriptorSet &descriptor_set)
descriptor_set.mark_freed(); descriptor_set.mark_freed();
} }
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -62,4 +62,4 @@ class VKDescriptorPools {
bool is_last_pool_active(); bool is_last_pool_active();
void add_new_pool(); void add_new_pool();
}; };
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -56,4 +56,4 @@ void VKStateManager::texture_unpack_row_length_set(uint /*len*/)
{ {
} }
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -27,4 +27,4 @@ class VKStateManager : public StateManager {
void texture_unpack_row_length_set(uint len) override; void texture_unpack_row_length_set(uint len) override;
}; };
} // namespace blender::gpu } // namespace blender::gpu

View File

@ -10,10 +10,10 @@ set(INC
../../blenlib ../../blenlib
../../bmesh ../../bmesh
../../depsgraph ../../depsgraph
../../geometry
../../makesdna ../../makesdna
../../makesrna ../../makesrna
../../windowmanager ../../windowmanager
../../geometry
../../../../extern/fmtlib/include ../../../../extern/fmtlib/include
../../../../intern/guardedalloc ../../../../intern/guardedalloc
) )
@ -23,37 +23,37 @@ set(INC_SYS
) )
set(SRC set(SRC
exporter/ply_export.cc
exporter/ply_export_data.cc exporter/ply_export_data.cc
exporter/ply_export_header.cc exporter/ply_export_header.cc
exporter/ply_export_load_plydata.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_ascii.cc
exporter/ply_file_buffer_binary.cc exporter/ply_file_buffer_binary.cc
exporter/ply_file_buffer.cc importer/ply_import.cc
importer/ply_import_ascii.cc importer/ply_import_ascii.cc
importer/ply_import_binary.cc importer/ply_import_binary.cc
importer/ply_import_mesh.cc importer/ply_import_mesh.cc
importer/ply_import.cc
IO_ply.cc IO_ply.cc
exporter/ply_export.hh
exporter/ply_export_data.hh exporter/ply_export_data.hh
exporter/ply_export_header.hh exporter/ply_export_header.hh
exporter/ply_export_load_plydata.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_ascii.hh
exporter/ply_file_buffer_binary.hh exporter/ply_file_buffer_binary.hh
exporter/ply_file_buffer.hh importer/ply_import.hh
importer/ply_import_ascii.hh importer/ply_import_ascii.hh
importer/ply_import_binary.hh importer/ply_import_binary.hh
importer/ply_import_mesh.hh importer/ply_import_mesh.hh
importer/ply_import.hh
IO_ply.h IO_ply.h
intern/ply_data.hh intern/ply_data.hh
intern/ply_functions.hh
intern/ply_functions.cc intern/ply_functions.cc
intern/ply_functions.hh
) )
set(LIB set(LIB