[Bf-blender-cvs] [ccbde00a835] sculpt-dev: Merge sculpt-dev -> master
Joseph Eagar
noreply at git.blender.org
Sun Jan 23 21:56:57 CET 2022
Commit: ccbde00a835a6cd88d8409608339a87e62d5bb46
Author: Joseph Eagar
Date: Sun Jan 23 12:27:34 2022 -0800
Branches: sculpt-dev
https://developer.blender.org/rBccbde00a835a6cd88d8409608339a87e62d5bb46
Merge sculpt-dev -> master
===================================================================
M build_files/build_environment/CMakeLists.txt
M build_files/build_environment/cmake/download.cmake
M build_files/build_environment/cmake/freetype.cmake
M build_files/build_environment/cmake/harvest.cmake
M build_files/build_environment/cmake/versions.cmake
M build_files/build_environment/install_deps.sh
M build_files/cmake/platform/platform_apple.cmake
M build_files/cmake/platform/platform_unix.cmake
M build_files/cmake/platform/platform_win32.cmake
M doc/python_api/examples/bpy.types.Bone.convert_local_to_pose.py
M doc/python_api/sphinx_doc_gen.py
M intern/cycles/blender/addon/ui.py
M intern/cycles/blender/mesh.cpp
M intern/cycles/blender/object.cpp
M intern/cycles/blender/output_driver.cpp
M intern/cycles/device/metal/bvh.h
M intern/cycles/device/metal/bvh.mm
M intern/cycles/device/metal/device_impl.h
M intern/cycles/device/metal/device_impl.mm
M intern/cycles/device/metal/kernel.h
M intern/cycles/device/metal/kernel.mm
M intern/cycles/integrator/pass_accessor.cpp
M intern/cycles/kernel/bvh/local.h
M intern/cycles/kernel/bvh/shadow_all.h
M intern/cycles/kernel/bvh/traversal.h
M intern/cycles/kernel/bvh/volume.h
M intern/cycles/kernel/bvh/volume_all.h
M intern/cycles/kernel/closure/volume.h
M intern/cycles/kernel/device/metal/kernel.metal
M intern/cycles/kernel/film/read.h
M intern/cycles/kernel/geom/motion_triangle_intersect.h
M intern/cycles/kernel/geom/triangle_intersect.h
M intern/cycles/kernel/integrator/shade_surface.h
M intern/cycles/kernel/integrator/shade_volume.h
M intern/cycles/kernel/svm/attribute.h
M intern/cycles/scene/alembic.cpp
M intern/cycles/scene/alembic.h
M intern/cycles/scene/alembic_read.cpp
M intern/cycles/scene/alembic_read.h
M intern/cycles/scene/colorspace.cpp
M intern/cycles/scene/colorspace.h
M intern/cycles/scene/constant_fold.cpp
M intern/cycles/scene/image.cpp
M intern/cycles/scene/mesh.cpp
M intern/cycles/scene/mesh.h
M intern/cycles/scene/mesh_subdivision.cpp
M intern/cycles/util/array.h
M intern/cycles/util/math_int4.h
M intern/ghost/intern/GHOST_WindowX11.cpp
M intern/ghost/intern/GHOST_Wintab.cpp
M intern/ghost/intern/GHOST_Wintab.h
M intern/ghost/test/CMakeLists.txt
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M release/scripts/modules/keyingsets_utils.py
M release/scripts/startup/bl_operators/wm.py
M release/scripts/startup/bl_ui/properties_constraint.py
M release/scripts/startup/bl_ui/properties_data_mesh.py
M release/scripts/startup/bl_ui/properties_object.py
M release/scripts/startup/bl_ui/properties_paint_common.py
M release/scripts/startup/bl_ui/space_userpref.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/nodeitems_builtins.py
M source/blender/blenfont/CMakeLists.txt
M source/blender/blenkernel/BKE_blendfile_link_append.h
M source/blender/blenkernel/BKE_brush_engine.h
M source/blender/blenkernel/BKE_brush_engine.hh
M source/blender/blenkernel/BKE_cachefile.h
M source/blender/blenkernel/BKE_customdata.h
M source/blender/blenkernel/BKE_main.h
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/BKE_mesh_runtime.h
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/BKE_subdiv.h
M source/blender/blenkernel/BKE_subdiv_modifier.h
M source/blender/blenkernel/BKE_volume.h
M source/blender/blenkernel/BKE_volume_to_mesh.hh
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/bassrelief.cc
M source/blender/blenkernel/intern/blendfile_link_append.c
M source/blender/blenkernel/intern/bpath.c
M source/blender/blenkernel/intern/brush_channel_define.h
A source/blender/blenkernel/intern/brush_channel_define_header.h
M source/blender/blenkernel/intern/brush_channel_names.hh
M source/blender/blenkernel/intern/brush_engine.c
M source/blender/blenkernel/intern/brush_engine.cc
M source/blender/blenkernel/intern/cachefile.c
M source/blender/blenkernel/intern/curve.cc
M source/blender/blenkernel/intern/customdata.cc
M source/blender/blenkernel/intern/geometry_component_mesh.cc
M source/blender/blenkernel/intern/mesh.cc
M source/blender/blenkernel/intern/mesh_merge.c
M source/blender/blenkernel/intern/mesh_runtime.c
M source/blender/blenkernel/intern/multires_reshape.h
M source/blender/blenkernel/intern/multires_reshape_smooth.c
M source/blender/blenkernel/intern/multires_reshape_util.c
M source/blender/blenkernel/intern/node.cc
M source/blender/blenkernel/intern/paint.c
M source/blender/blenkernel/intern/pbvh.c
M source/blender/blenkernel/intern/pointcache.c
M source/blender/blenkernel/intern/spline_nurbs.cc
M source/blender/blenkernel/intern/subdiv_converter_mesh.c
M source/blender/blenkernel/intern/subdiv_inline.h
M source/blender/blenkernel/intern/subdiv_modifier.c
M source/blender/blenkernel/intern/volume.cc
M source/blender/blenkernel/intern/volume_to_mesh.cc
M source/blender/blenlib/BLI_math_vector.hh
M source/blender/blenlib/BLI_vector_set.hh
M source/blender/blenlib/intern/math_base_inline.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenlib/intern/timecode.c
M source/blender/blenlib/tests/BLI_any_test.cc
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_300.c
M source/blender/blenloader/intern/versioning_legacy.c
M source/blender/blenloader/intern/versioning_userdef.c
M source/blender/bmesh/CMakeLists.txt
M source/blender/bmesh/bmesh.h
M source/blender/bmesh/intern/bmesh_construct.c
M source/blender/bmesh/intern/bmesh_construct.h
M source/blender/bmesh/intern/bmesh_mesh.c
D source/blender/bmesh/intern/bmesh_mesh_convert.c
M source/blender/bmesh/intern/bmesh_private.h
M source/blender/bmesh/operators/bmo_create.c
M source/blender/bmesh/operators/bmo_hull.c
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/draw/CMakeLists.txt
M source/blender/draw/engines/overlay/overlay_armature.c
M source/blender/draw/engines/overlay/overlay_shader.c
M source/blender/draw/engines/overlay/shaders/edit_mesh_common_lib.glsl
M source/blender/draw/engines/overlay/shaders/edit_mesh_vert.glsl
M source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl
M source/blender/draw/engines/workbench/shaders/workbench_data_lib.glsl
M source/blender/draw/engines/workbench/shaders/workbench_effect_cavity_frag.glsl
M source/blender/draw/engines/workbench/shaders/workbench_image_lib.glsl
M source/blender/draw/engines/workbench/shaders/workbench_prepass_frag.glsl
M source/blender/draw/engines/workbench/shaders/workbench_prepass_hair_vert.glsl
M source/blender/draw/engines/workbench/shaders/workbench_prepass_pointcloud_vert.glsl
M source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl
M source/blender/draw/engines/workbench/shaders/workbench_shader_interface_lib.glsl
M source/blender/draw/engines/workbench/shaders/workbench_transparent_accum_frag.glsl
M source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
M source/blender/draw/intern/draw_cache_impl_subdivision.cc
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/intern/mesh_extractors/extract_mesh.h
M source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc
M source/blender/draw/intern/shaders/common_fullscreen_vert.glsl
M source/blender/draw/intern/shaders/common_pointcloud_lib.glsl
M source/blender/draw/intern/shaders/common_view_lib.glsl
M source/blender/editors/asset/intern/asset_indexer.cc
M source/blender/editors/asset/intern/asset_list.cc
M source/blender/editors/curve/editcurve.c
M source/blender/editors/curve/editcurve_add.c
M source/blender/editors/geometry/CMakeLists.txt
M source/blender/editors/geometry/geometry_attributes.cc
M source/blender/editors/geometry/geometry_intern.hh
M source/blender/editors/geometry/geometry_ops.cc
M source/blender/editors/gpencil/drawgpencil.c
M source/blender/editors/gpencil/editaction_gpencil.c
M source/blender/editors/include/BIF_glutil.h
M source/blender/editors/include/ED_node.h
M source/blender/editors/include/ED_transform.h
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_draw.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/interface/interface_intern.h
M source/blender/editors/interface/interface_template_list.cc
M source/blender/editors/interface/interface_template_search_menu.cc
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/io/io_cache.c
M source/blender/editors/io/io_cache.h
M source/blender/editors/io/io_ops.c
M source/blender/editors/mask/mask_draw.c
M source/blender/editors/mesh/editmesh_undo.c
M source/blender/editors/object/object_bake.c
M source/blender/editors/object/object_bake_api.c
M source/blender/editors/object/object_transform.c
M source/blender/editors/render/render_preview.cc
M source/blender/editors/screen/glutil.c
M source/blender/editors/sculpt_paint/sculpt_intern.h
M source/blender/editors/space_file/file_draw.c
M source/blender/editors/space_file/filelist.c
M source/blender/editors/space_file/space_file.c
M source/blender/editors/space_node/CMakeLists.txt
M source/blender/editors/space_node/drawnode.cc
M source/blender/editors/space_node/node_add.cc
M source/blender/editors/space_node/node_draw.cc
M source/blender/editors/space_node/node_edit.cc
M source/blender/editors/space_node/node_geometry_attribute_search.cc
M source/blender/editors/space_node/node_gizmo.cc
M source/blender/editors/space_node/node_group.cc
M source/blender/editors/space_node/node_intern.hh
M source/blender/editors/space_node/node_ops.cc
M source/blender/editors/space_node/node_relationships.cc
M source/blender/editors/space_node/node_select.cc
M source/blender/editors/space_node/node_templates.cc
D source/blender/editors/space_node/node_toolbar.cc
M source/blender/editors/space_node/node_view.cc
M source/blender/editors/space_node/space_node.cc
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_thumbnails.c
M source/blender/editors/space_topbar/space_topbar.c
M source/blender/editors/space_view3d/view3d_buttons.c
M source/blender/editors/transform/transform_convert_curve.c
M source/blender/editors/transform/transform_convert_mesh.c
M source/blender/editors/transform/transform_convert_mesh_edge.c
M source/blender/editors/transform/transform_convert_sequencer.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_gizmo_extrude_3d.c
M source/blender/editors/transform/transform_mode.c
M source/blender/editors/transform/transform_mode.h
M source/blender/editors/transform/transform_mode_edge_crease.c
M source/blender/editors/transform/transform_ops.c
M source/blender/freestyle/CMakeLists.txt
M source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
M source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
M source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
M source/blender/gpu/CMakeLists.txt
M source/blender/gpu/GPU_immediate.h
M source/blender/gpu/GPU_shader.h
M source/blender/gpu/intern/gpu_capabilities_private.hh
M source/blender/gpu/intern/gpu_immediate.cc
M source/blender/gpu/intern/gpu_init_exit.c
M source/blender/gpu/intern/gpu_shader.cc
M source/blender/gpu/intern/gpu_shader_builtin.c
M source/blender/gpu/intern/gpu_shader_interface.hh
M source/blender/gpu/intern/gpu_shader_private.hh
M source/blender/gpu/opengl/gl_backend.cc
M source/blender/gpu/opengl/gl_context.hh
M source/blender/gpu/opengl/gl_shader.cc
M source/blender/gpu/opengl/gl_shader.hh
M source/blender/gpu/opengl/gl_shader_interface.cc
M source/blender/gpu/opengl/gl_shader_interface.hh
M source/blender/gpu/shaders/gpu_shader_2D_area_borders_frag.glsl
M source/blender/gpu/shaders/gpu_shader_2D_area_borders_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_flat_color_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_image_multi_rect_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_image_rect_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_image_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_line_dashed_frag.glsl
M source/blender/gpu/shaders/gpu_shader_2D_line_dashed_uniform_color_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_nodelink_frag.glsl
M source/blender/gpu/shaders/gpu_shader_2D_nodelink_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_aa_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_outline_aa_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_point_varying_size_varying_color_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_smooth_color_frag.glsl
M source/blender/gpu/shaders/gpu_shader_2D_smooth_color_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_widget_base_frag.glsl
M source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_frag.glsl
M source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl
M source/blender/gpu/shaders/gpu_shader_3D_clipped_uniform_color_vert.glsl
M source/blender/gpu/shaders/gpu_shader_3D_flat_color_vert.glsl
M source/blender/gpu/shaders/gpu_shader_3D_image_vert.glsl
M source/blender/gpu/shaders/gpu_shader_3D_line_dashed_uniform_color_vert.glsl
M source/blender/gpu/shaders/gpu_shader_3D_normal_vert.glsl
M source/blender/gpu/shaders/gpu_shader_3D_passthrough_vert.glsl
M source/blender/gpu/shaders/gpu_shader_3D_point_fixed_size_varying_color_vert.glsl
M source/blender/gpu/shaders/gpu_shader_3D_point_uniform_size_aa_vert.glsl
M source/blender/gpu/shaders/gpu_shader_3D_point_varying_size_varying_color_vert.glsl
M source/blender/gpu/shaders/gpu_shader_3D_polyline_frag.glsl
M source/blender/gpu/shaders/gpu_shader_3D_polyline_geom.glsl
M source/blender/gpu/shaders/gpu_shader_3D_polyline_vert.glsl
M source/blender/gpu/shaders/gpu_shader_3D_smooth_color_frag.glsl
M source/blender/gpu/shaders/gpu_shader_3D_smooth_color_vert.glsl
M source/blender/gpu/shaders/gpu_shader_3D_vert.glsl
M source/blender/gpu/shaders/gpu_shader_cfg_world_clip_lib.glsl
M source/blender/gpu/shaders/gpu_shader_checker_frag.glsl
M source/blender/gpu/shaders/gpu_shader_colorspace_lib.glsl
M source/blender/gpu/shaders/gpu_shader_common_obinfos_lib.glsl
M source/blender/gpu/shaders/gpu_shader_diag_stripes_frag.glsl
M source/blender/gpu/shaders/gpu_shader_flat_color_alpha_test_0_frag.glsl
M source/blender/gpu/shaders/gpu_shader_flat_color_frag.glsl
M source/blender/gpu/shaders/gpu_shader_flat_id_frag.glsl
M source/blender/gpu/shaders/gpu_shader_geometry.glsl
M source/blender/gpu/shaders/gpu_shader_gpencil_stroke_frag.glsl
M source/blender/gpu/shaders/gpu_shader_gpencil_stroke_geom.glsl
M source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl
M source/blender/gpu/shaders/gpu_shader_image_color_frag.glsl
M source/blender/gpu/shaders/gpu_shader_image_desaturate_frag.glsl
M source/blender/gpu/shaders/gpu_shader_image_frag.glsl
M source/blender/gpu/shaders/gpu_shader_image_modulate_alpha_frag.glsl
M source/blender/gpu/shaders/gpu_shader_image_overlays_merge_frag.glsl
M source/blender/gpu/shaders/gpu_shader_image_overlays_stereo_merge_frag.glsl
M source/blender/gpu/shaders/gpu_shader_image_shuffle_color_frag.glsl
M source/blender/gpu/shaders/gpu_shader_image_varying_color_frag.glsl
M source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl
M source/blender/gpu/shaders/gpu_shader_keyframe_shape_frag.glsl
M source/blender/gpu/shaders/gpu_shader_keyframe_shape_vert.glsl
M source/blender/gpu/shaders/gpu_shader_point_uniform_color_aa_frag.glsl
M source/blender/gpu/shaders/gpu_shader_point_uniform_color_outline_aa_frag.glsl
M source/blender/gpu/shaders/gpu_shader_point_varying_color_frag.glsl
M source/blender/gpu/shaders/gpu_shader_point_varying_color_varying_outline_aa_frag.glsl
M source/blender/gpu/shaders/gpu_shader_simple_lighting_frag.glsl
M source/blender/gpu/shaders/gpu_shader_text_frag.glsl
M source/blender/gpu/shaders/gpu_shader_text_vert.glsl
M source/blender/gpu/shaders/gpu_shader_uniform_color_frag.glsl
M source/blender/gpu/shaders/material/gpu_shader_material_tex_voronoi.glsl
M source/blender/io/alembic/ABC_alembic.h
M source/blender/io/alembic/exporter/abc_writer_mesh.cc
M source/blender/io/alembic/intern/abc_reader_archive.cc
M source/blender/io/alembic/intern/abc_reader_archive.h
M source/blender/io/alembic/intern/abc_reader_mesh.cc
M source/blender/io/alembic/intern/alembic_capi.cc
M source/blender/io/usd/intern/usd_reader_mesh.cc
M source/blender/io/usd/intern/usd_reader_mesh.h
M source/blender/io/usd/intern/usd_writer_mesh.cc
M source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
M source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh
M source/blender/io/wavefront_obj/exporter/obj_export_io.hh
M source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
M source/blender/io/wavefront_obj/exporter/obj_export_mesh.hh
M source/blender/io/wavefront_obj/exporter/obj_exporter.cc
M source/blender/io/wavefront_obj/tests/obj_exporter_tests.cc
M source/blender/makesdna/DNA_ID.h
M source/blender/makesdna/DNA_cachefile_types.h
M source/blender/makesdna/DNA_customdata_types.h
M source/blender/makesdna/DNA_gpencil_modifier_defaults.h
M source/blender/makesdna/DNA_gpencil_modifier_types.h
M source/blender/makesdna/DNA_lineart_types.h
M source/blender/makesdna/DNA_mesh_types.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/DNA_scene_defaults.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_sculpt_brush_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesdna/intern/dna_rename_defs.h
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/RNA_enum_items.h
M source/blender/makesrna/RNA_enum_types.h
M source/blender/makesrna/intern/rna_action.c
M source/blender/makesrna/intern/rna_animviz.c
M source/blender/makesrna/intern/rna_attribute.c
M source/blender/makesrna/intern/rna_cachefile.c
M source/blender/makesrna/intern/rna_fcurve.c
M source/blender/makesrna/intern/rna_gpencil_modifier.c
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_object_api.c
M source/blender/makesrna/intern/rna_rna.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/makesrna/intern/rna_ui_api.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/makesrna/intern/rna_wm.c
M source/blender/modifiers/intern/MOD_boolean.cc
M source/blender/modifiers/intern/MOD_meshsequencecache.c
M source/blender/modifiers/intern/MOD_subsurf.c
M source/blender/modifiers/intern/MOD_weld.cc
M source/blender/nodes/NOD_geometry.h
M source/blender/nodes/NOD_static_types.h
M source/blender/nodes/composite/nodes/node_composite_scene_time.cc
M source/blender/nodes/geometry/CMakeLists.txt
M source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_set_handles.cc
M source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc
M source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc
M source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc
M source/blender/nodes/intern/node_socket_declarations.cc
M source/blender/nodes/shader/node_shader_tree.cc
M source/blender/python/gpu/gpu_py_framebuffer.c
M source/blender/python/intern/bpy_props.c
M source/blender/render/CMakeLists.txt
M source/blender/render/RE_bake.h
M source/blender/render/RE_multires_bake.h
M source/blender/render/intern/bake.c
M source/blender/render/intern/multires_bake.c
M source/blender/sequencer/CMakeLists.txt
M source/blender/sequencer/SEQ_clipboard.h
M source/blender/sequencer/SEQ_sequencer.h
M source/blender/sequencer/intern/clipboard.c
M source/blender/sequencer/intern/proxy.c
M source/blender/sequencer/intern/sequencer.c
M source/blender/sequencer/intern/sequencer.h
M source/blender/sequencer/intern/strip_edit.c
M source/blender/sequencer/intern/strip_transform.c
M source/blender/sequencer/intern/utils.c
M source/blender/windowmanager/intern/wm_dragdrop.c
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_gesture.c
M source/blender/windowmanager/wm_event_types.h
M source/creator/CMakeLists.txt
M tests/python/bl_alembic_io_test.py
===================================================================
diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt
index af1653de59a..0d305e0dd1f 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -63,6 +63,7 @@ include(cmake/jpeg.cmake)
include(cmake/blosc.cmake)
include(cmake/pthreads.cmake)
include(cmake/openexr.cmake)
+include(cmake/brotli.cmake)
include(cmake/freetype.cmake)
include(cmake/freeglut.cmake)
include(cmake/glew.cmake)
diff --git a/build_files/build_environment/cmake/download.cmake b/build_files/build_environment/cmake/download.cmake
index 2a84202ea02..d3a4d767c08 100644
--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@ -94,3 +94,4 @@ download_source(POTRACE)
download_source(HARU)
download_source(ZSTD)
download_source(FLEX)
+download_source(BROTLI)
diff --git a/build_files/build_environment/cmake/freetype.cmake b/build_files/build_environment/cmake/freetype.cmake
index 49a83cb3377..52261b47618 100644
--- a/build_files/build_environment/cmake/freetype.cmake
+++ b/build_files/build_environment/cmake/freetype.cmake
@@ -23,9 +23,12 @@ set(FREETYPE_EXTRA_ARGS
-DWITH_HarfBuzz=OFF
-DFT_WITH_HARFBUZZ=OFF
-DFT_WITH_BZIP2=OFF
+ -DFT_WITH_BROTLI=ON
-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE
- -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE)
+ -DPC_BROTLIDEC_INCLUDEDIR=${LIBDIR}/brotli/include
+ -DPC_BROTLIDEC_LIBDIR=${LIBDIR}/brotli/lib
+ )
ExternalProject_Add(external_freetype
URL file://${PACKAGE_DIR}/${FREETYPE_FILE}
@@ -36,6 +39,11 @@ ExternalProject_Add(external_freetype
INSTALL_DIR ${LIBDIR}/freetype
)
+add_dependencies(
+ external_freetype
+ external_brotli
+)
+
if(BUILD_MODE STREQUAL Release AND WIN32)
ExternalProject_Add_Step(external_freetype after_install
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake
index 4d06430ea49..0e68e720b44 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -79,6 +79,8 @@ endfunction()
harvest(alembic/include alembic/include "*.h")
harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a)
harvest(alembic/bin alembic/bin "*")
+harvest(brotli/include brotli/include "*.h")
+harvest(brotli/lib brotli/lib "*.a")
harvest(boost/include boost/include "*")
harvest(boost/lib boost/lib "*.a")
harvest(ffmpeg/include ffmpeg/include "*.h")
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index c758dbd265e..cc811cef06f 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -83,9 +83,9 @@ else()
set(OPENEXR_VERSION_POSTFIX)
endif()
-set(FREETYPE_VERSION 2.10.2)
+set(FREETYPE_VERSION 2.11.0)
set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
-set(FREETYPE_HASH b1cb620e4c875cd4d1bfa04945400945)
+set(FREETYPE_HASH cf09172322f6b50cf8f568bf8fe14bde)
set(FREETYPE_HASH_TYPE MD5)
set(FREETYPE_FILE freetype-${FREETYPE_VERSION}.tar.gz)
@@ -500,3 +500,10 @@ set(ZSTD_FILE zstd-${ZSTD_VERSION}.tar.gz)
set(SSE2NEON_GIT https://github.com/DLTcollab/sse2neon.git)
set(SSE2NEON_GIT_HASH fe5ff00bb8d19b327714a3c290f3e2ce81ba3525)
+
+set(BROTLI_VERSION v1.0.9)
+set(BROTLI_URI https://github.com/google/brotli/archive/refs/tags/${BROTLI_VERSION}.tar.gz)
+set(BROTLI_HASH f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46)
+set(BROTLI_HASH_TYPE SHA256)
+set(BROTLI_FILE brotli-${BROTLI_VERSION}.tar.gz)
+
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index bf24c3ef285..ce7a251bfba 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -492,7 +492,7 @@ OIIO_SKIP=false
LLVM_VERSION="12.0.0"
LLVM_VERSION_SHORT="12.0"
LLVM_VERSION_MIN="11.0"
-LLVM_VERSION_MEX="13.0"
+LLVM_VERSION_MEX="14.0"
LLVM_VERSION_FOUND=""
LLVM_FORCE_BUILD=false
LLVM_FORCE_REBUILD=false
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index 447645b6806..8acea1be841 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -166,7 +166,11 @@ if(WITH_FFTW3)
find_package(Fftw3)
endif()
+# FreeType compiled with Brotli compression for woff2.
find_package(Freetype REQUIRED)
+list(APPEND FREETYPE_LIBRARIES
+ ${LIBDIR}/brotli/lib/libbrotlicommon-static.a
+ ${LIBDIR}/brotli/lib/libbrotlidec-static.a)
if(WITH_IMAGE_OPENEXR)
find_package(OpenEXR)
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index 43dbc7c9c98..b6da737af71 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -700,14 +700,18 @@ if(CMAKE_COMPILER_IS_GNUCC)
find_path(
MOLD_BIN_DIR "ld"
HINTS "${MOLD_PREFIX}"
- PATH_SUFFIXES "lib/mold" "lib64/mold"
+ # The default path is `libexec`, Arch Linux for e.g.
+ # replaces this with `lib` so check both.
+ PATH_SUFFIXES "libexec/mold" "lib/mold" "lib64/mold"
NO_DEFAULT_PATH
NO_CACHE
)
if(NOT MOLD_BIN_DIR)
message(STATUS
"The mold linker could not find the directory containing the linker command "
- "(typically \"${MOLD_PREFIX}/lib/mold\"), using system linker.")
+ "(typically "
+ "\"${MOLD_PREFIX}/libexec/mold/ld\") or "
+ "\"${MOLD_PREFIX}/lib/mold/ld\") using system linker.")
set(WITH_LINKER_MOLD OFF)
endif()
unset(MOLD_PREFIX)
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 851dafc34fb..0439e2fa5c2 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -347,7 +347,11 @@ set(FREETYPE_INCLUDE_DIRS
${LIBDIR}/freetype/include
${LIBDIR}/freetype/include/freetype2
)
-set(FREETYPE_LIBRARY ${LIBDIR}/freetype/lib/freetype2ST.lib)
+set(FREETYPE_LIBRARIES
+ ${LIBDIR}/freetype/lib/freetype2ST.lib
+ ${LIBDIR}/brotli/lib/brotlidec-static.lib
+ ${LIBDIR}/brotli/lib/brotlicommon-static.lib
+)
windows_find_package(freetype REQUIRED)
if(WITH_FFTW3)
diff --git a/doc/python_api/examples/bpy.types.Bone.convert_local_to_pose.py b/doc/python_api/examples/bpy.types.Bone.convert_local_to_pose.py
index f3cc95dec61..4a88096cf6f 100644
--- a/doc/python_api/examples/bpy.types.Bone.convert_local_to_pose.py
+++ b/doc/python_api/examples/bpy.types.Bone.convert_local_to_pose.py
@@ -8,27 +8,42 @@ def set_pose_matrices(obj, matrix_map):
"Assign pose space matrices of all bones at once, ignoring constraints."
def rec(pbone, parent_matrix):
- matrix = matrix_map[pbone.name]
+ if pbone.name in matrix_map:
+ matrix = matrix_map[pbone.name]
- ## Instead of:
- # pbone.matrix = matrix
- # bpy.context.view_layer.update()
+ ## Instead of:
+ # pbone.matrix = matrix
+ # bpy.context.view_layer.update()
- # Compute and assign local matrix, using the new parent matrix
- if pbone.parent:
- pbone.matrix_basis = pbone.bone.convert_local_to_pose(
- matrix,
- pbone.bone.matrix_local,
- parent_matrix=parent_matrix,
- parent_matrix_local=pbone.parent.bone.matrix_local,
- invert=True
- )
+ # Compute and assign local matrix, using the new parent matrix
+ if pbone.parent:
+ pbone.matrix_basis = pbone.bone.convert_local_to_pose(
+ matrix,
+ pbone.bone.matrix_local,
+ parent_matrix=parent_matrix,
+ parent_matrix_local=pbone.parent.bone.matrix_local,
+ invert=True
+ )
+ else:
+ pbone.matrix_basis = pbone.bone.convert_local_to_pose(
+ matrix,
+ pbone.bone.matrix_local,
+ invert=True
+ )
else:
- pbone.matrix_basis = pbone.bone.convert_local_to_pose(
- matrix,
- pbone.bone.matrix_local,
- invert=True
- )
+ # Compute the updated pose matrix from local and new parent matrix
+ if pbone.parent:
+ matrix = pbone.bone.convert_local_to_pose(
+ pbone.matrix_basis,
+ pbone.bone.matrix_local,
+ parent_matrix=parent_matrix,
+ parent_matrix_local=pbone.parent.bone.matrix_local,
+ )
+ else:
+ matrix = pbone.bone.convert_local_to_pose(
+ pbone.matrix_basis,
+ pbone.bone.matrix_local,
+ )
# Recursively process children, passing the new matrix through
for child in pbone.children:
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index fda47194be0..0ae3b24578b 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -1762,6 +1762,7 @@ except ModuleNotFoundError:
fw("html_show_sphinx = False\n")
fw("html_baseurl = 'https://docs.blender.org/api/current/'\n")
fw("html_use_opensearch = 'https://docs.blender.org/api/current'\n")
+ fw("html_show_search_summary = True\n")
fw("html_split_index = True\n")
fw("html_static_path = ['static']\n")
fw("html_extra_path = ['static/favicon.ico', 'static/blender_logo.svg']\n")
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index e4fbc898070..5b600692152 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.p
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list