From bb5f6d437e69955c082d4f730f9016dceb83345d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 14 Jun 2025 15:55:41 +1000 Subject: [PATCH 1/3] Cleanup: sort DNA rename definitions --- source/blender/makesdna/intern/dna_rename_defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h index 690194786d7..9afa4e06a74 100644 --- a/source/blender/makesdna/intern/dna_rename_defs.h +++ b/source/blender/makesdna/intern/dna_rename_defs.h @@ -214,8 +214,8 @@ DNA_STRUCT_RENAME_MEMBER(ThemeSpace, show_back_grad, background_type) DNA_STRUCT_RENAME_MEMBER(UVProjectModifierData, num_projectors, projectors_num) DNA_STRUCT_RENAME_MEMBER(UserDef, autokey_flag, keying_flag) DNA_STRUCT_RENAME_MEMBER(UserDef, gp_manhattendist, gp_manhattandist) -DNA_STRUCT_RENAME_MEMBER(UserDef, pythondir, pythondir_legacy) DNA_STRUCT_RENAME_MEMBER(UserDef, max_shader_compilation_subprocesses, gpu_shader_workers) +DNA_STRUCT_RENAME_MEMBER(UserDef, pythondir, pythondir_legacy) DNA_STRUCT_RENAME_MEMBER(VFont, name, filepath) DNA_STRUCT_RENAME_MEMBER(View3D, far, clip_end) DNA_STRUCT_RENAME_MEMBER(View3D, local_collections_uuid, local_collections_uid) From c482c52346e29a8e25c6f60351d5fe87e63a96fc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 14 Jun 2025 15:57:33 +1000 Subject: [PATCH 2/3] Cleanup: sort CMake file lists --- source/blender/CMakeLists.txt | 2 +- source/blender/blenkernel/CMakeLists.txt | 4 ++-- source/blender/draw/CMakeLists.txt | 2 +- source/blender/editors/asset/CMakeLists.txt | 4 ++-- source/blender/gpu/CMakeLists.txt | 2 +- source/blender/imbuf/opencolorio/CMakeLists.txt | 2 +- source/blender/io/usd/CMakeLists.txt | 2 +- source/blender/makesdna/intern/CMakeLists.txt | 4 ++-- source/blender/nodes/shader/CMakeLists.txt | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index 672cdf0b0b1..92a131b9e9c 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -80,9 +80,9 @@ set(SRC_DNA_INC ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_space_enums.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_space_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_speaker_types.h - ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_theme_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_text_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_texture_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_theme_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_tracking_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_userdef_enums.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_userdef_types.h diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 6d34c21a2cf..02ad3ae4e88 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -57,8 +57,8 @@ set(SRC intern/attribute.cc intern/attribute_access.cc intern/attribute_legacy_convert.cc - intern/attribute_storage.cc intern/attribute_math.cc + intern/attribute_storage.cc intern/autoexec.cc intern/bake_data_block_map.cc intern/bake_geometry_nodes_modifier.cc @@ -831,9 +831,9 @@ add_dependencies(bf_blenkernel bf_rna) if(WITH_GTESTS) set(TEST_SRC intern/action_test.cc - intern/attribute_storage_test.cc intern/armature_test.cc intern/asset_metadata_test.cc + intern/attribute_storage_test.cc intern/bpath_test.cc intern/brush_test.cc intern/cryptomatte_test.cc diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index a46dfb4fe33..7b3bb00daf2 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -247,7 +247,6 @@ set(SRC engines/overlay/overlay_camera.hh engines/overlay/overlay_cursor.hh engines/overlay/overlay_curve.hh - engines/overlay/overlay_text.hh engines/overlay/overlay_empty.hh engines/overlay/overlay_engine.h engines/overlay/overlay_facing.hh @@ -276,6 +275,7 @@ set(SRC engines/overlay/overlay_relation.hh engines/overlay/overlay_sculpt.hh engines/overlay/overlay_speaker.hh + engines/overlay/overlay_text.hh engines/overlay/overlay_wireframe.hh engines/overlay/overlay_xray_fade.hh engines/select/select_defines.hh diff --git a/source/blender/editors/asset/CMakeLists.txt b/source/blender/editors/asset/CMakeLists.txt index 978237550ee..c9b9dc78196 100644 --- a/source/blender/editors/asset/CMakeLists.txt +++ b/source/blender/editors/asset/CMakeLists.txt @@ -5,9 +5,9 @@ set(INC . ../include - ../../makesrna - ../../imbuf ../../gpu + ../../imbuf + ../../makesrna # dna_type_offsets.h ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern # RNA_prototypes.hh diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 83d0fde2039..755da9a445a 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -799,8 +799,8 @@ if(WITH_GTESTS) tests/index_buffer_test.cc tests/push_constants_test.cc tests/shader_create_info_test.cc - tests/shader_test.cc tests/shader_preprocess_test.cc + tests/shader_test.cc tests/specialization_constants_test.cc tests/state_blend_test.cc tests/storage_buffer_test.cc diff --git a/source/blender/imbuf/opencolorio/CMakeLists.txt b/source/blender/imbuf/opencolorio/CMakeLists.txt index fb437563336..9a7b7260c0f 100644 --- a/source/blender/imbuf/opencolorio/CMakeLists.txt +++ b/source/blender/imbuf/opencolorio/CMakeLists.txt @@ -56,9 +56,9 @@ set(SRC intern/libocio/libocio_gpu_shader_binder.hh intern/libocio/libocio_look.cc intern/libocio/libocio_look.hh - intern/libocio/libocio_view.hh intern/libocio/libocio_processor.cc intern/libocio/libocio_processor.hh + intern/libocio/libocio_view.hh OCIO_api.hh OCIO_colorspace.hh diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt index 86bef88da4f..29200c9aef4 100644 --- a/source/blender/io/usd/CMakeLists.txt +++ b/source/blender/io/usd/CMakeLists.txt @@ -90,8 +90,8 @@ set(SRC intern/usd_writer_volume.cc intern/usd_reader_camera.cc - intern/usd_reader_domelight.cc intern/usd_reader_curve.cc + intern/usd_reader_domelight.cc intern/usd_reader_geom.cc intern/usd_reader_instance.cc intern/usd_reader_light.cc diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index ba77fed35ed..443a424a723 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -124,8 +124,8 @@ set(SRC dna_genfile.cc dna_utils.cc ${CMAKE_CURRENT_BINARY_DIR}/dna.cc - ${CMAKE_CURRENT_BINARY_DIR}/dna_verify.cc ${CMAKE_CURRENT_BINARY_DIR}/dna_struct_ids.cc + ${CMAKE_CURRENT_BINARY_DIR}/dna_verify.cc ${SRC_DNA_INC} ${CMAKE_CURRENT_BINARY_DIR}/dna_type_offsets.h @@ -135,9 +135,9 @@ set(SRC set_source_files_properties( ${CMAKE_CURRENT_BINARY_DIR}/dna.cc + ${CMAKE_CURRENT_BINARY_DIR}/dna_struct_ids.cc ${CMAKE_CURRENT_BINARY_DIR}/dna_type_offsets.h ${CMAKE_CURRENT_BINARY_DIR}/dna_verify.cc - ${CMAKE_CURRENT_BINARY_DIR}/dna_struct_ids.cc PROPERTIES GENERATED TRUE ) diff --git a/source/blender/nodes/shader/CMakeLists.txt b/source/blender/nodes/shader/CMakeLists.txt index 174a6cba74b..73963357a92 100644 --- a/source/blender/nodes/shader/CMakeLists.txt +++ b/source/blender/nodes/shader/CMakeLists.txt @@ -107,10 +107,10 @@ set(SRC nodes/node_shader_vector_transform.cc nodes/node_shader_vertex_color.cc nodes/node_shader_volume_absorption.cc + nodes/node_shader_volume_coefficients.cc nodes/node_shader_volume_info.cc nodes/node_shader_volume_principled.cc nodes/node_shader_volume_scatter.cc - nodes/node_shader_volume_coefficients.cc nodes/node_shader_wavelength.cc nodes/node_shader_wireframe.cc From fb3b1043d3df96731b6a79ab6b5efb7e8d3e6694 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 14 Jun 2025 16:01:04 +1000 Subject: [PATCH 3/3] Cleanup: spelling in comments (make check_spelling_*) --- source/blender/io/common/IO_abstract_hierarchy_iterator.h | 2 +- source/blender/io/usd/intern/usd_exporter_context.hh | 2 +- source/blender/io/usd/intern/usd_hierarchy_iterator.cc | 4 ++-- source/blender/io/usd/intern/usd_writer_pointinstancer.cc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/blender/io/common/IO_abstract_hierarchy_iterator.h b/source/blender/io/common/IO_abstract_hierarchy_iterator.h index 4e2cb32122b..4a21a41851b 100644 --- a/source/blender/io/common/IO_abstract_hierarchy_iterator.h +++ b/source/blender/io/common/IO_abstract_hierarchy_iterator.h @@ -124,7 +124,7 @@ struct HierarchyContext { void mark_as_not_instanced(); bool is_prototype() const; - /* For handling point instancing (Instance on Points geo node). */ + /* For handling point instancing (Instance on Points geometry node). */ bool is_point_instancer() const; bool is_object_visible(enum eEvaluationMode evaluation_mode) const; diff --git a/source/blender/io/usd/intern/usd_exporter_context.hh b/source/blender/io/usd/intern/usd_exporter_context.hh index 886cda6733e..1ece287ddd9 100644 --- a/source/blender/io/usd/intern/usd_exporter_context.hh +++ b/source/blender/io/usd/intern/usd_exporter_context.hh @@ -36,7 +36,7 @@ struct USDExporterContext { std::string export_file_path; std::function export_image_fn; - /** Optional callback for skel/shapekey path registration (used by USDPointInstancerWriter) */ + /** Optional callback for skel/shape-key path registration (used by USDPointInstancerWriter). */ std::function add_skel_mapping_fn; }; diff --git a/source/blender/io/usd/intern/usd_hierarchy_iterator.cc b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc index 85478913091..5c690792107 100644 --- a/source/blender/io/usd/intern/usd_hierarchy_iterator.cc +++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc @@ -244,8 +244,8 @@ void USDHierarchyIterator::determine_point_instancers(const HierarchyContext *co AbstractHierarchyWriter *USDHierarchyIterator::create_transform_writer( const HierarchyContext *context) { - /* transform writer is always called before data writers, so determin if the Xform's children is - * a point instancer before writing data */ + /* The transform writer is always called before data writers, + * so determine if the #Xform's children is a point instancer before writing data. */ if (params_.use_instancing) { determine_point_instancers(context); } diff --git a/source/blender/io/usd/intern/usd_writer_pointinstancer.cc b/source/blender/io/usd/intern/usd_writer_pointinstancer.cc index 00c55e65dbc..716285ad6b8 100644 --- a/source/blender/io/usd/intern/usd_writer_pointinstancer.cc +++ b/source/blender/io/usd/intern/usd_writer_pointinstancer.cc @@ -312,7 +312,7 @@ void USDPointInstancerWriter::process_instance_reference( } /* If the reference is GeometrySet, then override the transform with the transform of the - * Instance inside this Geometryset. */ + * Instance inside this GeometrySet. */ Span transforms = instances->transforms(); if (transforms.size() == 1) { if (proto_path_map.find(set_name) != proto_path_map.end()) {