Merge branch 'blender-v4.3-release'

2024-10-03 14:48:22 +10:00
parent 9bdaa51bb4 a9b977d256
commit ebb51364d4
4 changed files with 4 additions and 4 deletions
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -29,13 +29,13 @@ set(INC_SYS
 )

 set(SRC
+  eyedroppers/eyedropper_bone.cc
  eyedroppers/eyedropper_color.cc
  eyedroppers/eyedropper_colorband.cc
  eyedroppers/eyedropper_datablock.cc
  eyedroppers/eyedropper_depth.cc
  eyedroppers/eyedropper_driver.cc
  eyedroppers/eyedropper_gpencil_color.cc
-  eyedroppers/eyedropper_bone.cc
  eyedroppers/eyedropper_grease_pencil_color.cc
  eyedroppers/interface_eyedropper.cc
  interface.cc
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -41,8 +41,8 @@ set(SRC
  object_hook.cc
  object_light_linking_ops.cc
  object_modes.cc
-  object_multires_modifier.cc
  object_modifier.cc
+  object_multires_modifier.cc
  object_ops.cc
  object_random.cc
  object_relations.cc
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -31,6 +31,7 @@ set(DEFSRC
  rna_armature.cc
  rna_asset.cc
  rna_attribute.cc
+  rna_blendfile_import.cc
  rna_boid.cc
  rna_brush.cc
  rna_cachefile.cc
@@ -55,7 +56,6 @@ set(DEFSRC
  rna_light.cc
  rna_lightprobe.cc
  rna_linestyle.cc
-  rna_blendfile_import.cc
  rna_main.cc
  rna_mask.cc
  rna_material.cc
--- a/source/blender/nodes/function/CMakeLists.txt
+++ b/source/blender/nodes/function/CMakeLists.txt
@@ -40,6 +40,7 @@ set(SRC
  nodes/node_fn_integer_math.cc
  nodes/node_fn_invert_matrix.cc
  nodes/node_fn_invert_rotation.cc
+  nodes/node_fn_matrix_determinant.cc
  nodes/node_fn_matrix_multiply.cc
  nodes/node_fn_project_point.cc
  nodes/node_fn_quaternion_to_rotation.cc
@@ -60,7 +61,6 @@ set(SRC
  nodes/node_fn_transform_point.cc
  nodes/node_fn_transpose_matrix.cc
  nodes/node_fn_value_to_string.cc
-  nodes/node_fn_matrix_determinant.cc

  node_function_util.cc