griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Campbell Barton
2025-06-14 16:02:07 +10:00
parent 6046b81e21 fb3b1043d3
commit bb9d491ca5
14 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/CMakeLists.txt
View File

@@ -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

4
source/blender/blenkernel/CMakeLists.txt
View File

@@ -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

2
source/blender/draw/CMakeLists.txt
View File

@@ -248,7 +248,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
@@ -277,6 +276,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

4
source/blender/editors/asset/CMakeLists.txt
View File

@@ -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

2
source/blender/gpu/CMakeLists.txt
View File

@@ -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

2
source/blender/imbuf/opencolorio/CMakeLists.txt
View File

@@ -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

2
source/blender/io/common/IO_abstract_hierarchy_iterator.h
View File

@@ -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;

2
source/blender/io/usd/CMakeLists.txt
View File

@@ -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

2
source/blender/io/usd/intern/usd_exporter_context.hh
View File

@@ -36,7 +36,7 @@ struct USDExporterContext {
std::string export_file_path;
std::function<std::string(Main *, Scene *, Image *, ImageUser *)> 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<void(const Object *, const pxr::SdfPath &)> add_skel_mapping_fn;
};

4
source/blender/io/usd/intern/usd_hierarchy_iterator.cc
View File

@@ -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);
}

2
source/blender/io/usd/intern/usd_writer_pointinstancer.cc
View File

@@ -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<float4x4> transforms = instances->transforms();
if (transforms.size() == 1) {
if (proto_path_map.find(set_name) != proto_path_map.end()) {

4
source/blender/makesdna/intern/CMakeLists.txt
View File

@@ -123,8 +123,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
@@ -134,9 +134,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
)

2
source/blender/makesdna/intern/dna_rename_defs.h
View File

@@ -217,8 +217,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)

2
source/blender/nodes/shader/CMakeLists.txt
View File

@@ -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