[Bf-blender-cvs] [0d5266d6247] soc-2021-curves: Merge master
dilithjay
noreply at git.blender.org
Sat Dec 25 13:28:01 CET 2021
Commit: 0d5266d6247e4917d77aeb85d9e388bbb876c7b2
Author: dilithjay
Date: Sun Dec 19 17:01:18 2021 +0530
Branches: soc-2021-curves
https://developer.blender.org/rB0d5266d6247e4917d77aeb85d9e388bbb876c7b2
Merge master
===================================================================
M CMakeLists.txt
M build_files/cmake/config/blender_release.cmake
M doc/doxygen/doxygen.intern.h
M doc/doxygen/doxygen.source.h
M intern/atomic/atomic_ops.h
M intern/atomic/intern/atomic_ops_ext.h
M intern/atomic/intern/atomic_ops_msvc.h
M intern/atomic/intern/atomic_ops_unix.h
M intern/atomic/intern/atomic_ops_utils.h
M intern/clog/CLG_log.h
M intern/clog/clog.c
M intern/cycles/blender/CMakeLists.txt
M intern/cycles/blender/addon/properties.py
M intern/cycles/blender/addon/ui.py
M intern/cycles/blender/geometry.cpp
M intern/cycles/blender/object.cpp
A intern/cycles/blender/pointcloud.cpp
M intern/cycles/blender/session.cpp
M intern/cycles/blender/shader.cpp
M intern/cycles/blender/sync.cpp
M intern/cycles/blender/sync.h
M intern/cycles/bvh/build.cpp
M intern/cycles/bvh/build.h
M intern/cycles/bvh/bvh.cpp
M intern/cycles/bvh/bvh2.cpp
M intern/cycles/bvh/embree.cpp
M intern/cycles/bvh/embree.h
M intern/cycles/bvh/params.h
M intern/cycles/bvh/split.cpp
M intern/cycles/bvh/split.h
M intern/cycles/cmake/external_libs.cmake
M intern/cycles/device/metal/util.mm
M intern/cycles/device/multi/device.cpp
M intern/cycles/device/optix/device_impl.cpp
M intern/cycles/device/optix/device_impl.h
M intern/cycles/integrator/render_scheduler.cpp
M intern/cycles/integrator/render_scheduler.h
M intern/cycles/kernel/CMakeLists.txt
M intern/cycles/kernel/bvh/bvh.h
M intern/cycles/kernel/bvh/shadow_all.h
M intern/cycles/kernel/bvh/traversal.h
M intern/cycles/kernel/bvh/types.h
M intern/cycles/kernel/bvh/util.h
M intern/cycles/kernel/device/optix/kernel.cu
M intern/cycles/kernel/geom/geom.h
A intern/cycles/kernel/geom/motion_point.h
A intern/cycles/kernel/geom/point.h
A intern/cycles/kernel/geom/point_intersect.h
M intern/cycles/kernel/geom/primitive.h
M intern/cycles/kernel/geom/shader_data.h
M intern/cycles/kernel/osl/services.cpp
M intern/cycles/kernel/osl/services.h
M intern/cycles/kernel/osl/shaders/CMakeLists.txt
A intern/cycles/kernel/osl/shaders/node_vector_map_range.osl
M intern/cycles/kernel/svm/map_range.h
M intern/cycles/kernel/svm/svm.h
M intern/cycles/kernel/svm/types.h
M intern/cycles/kernel/svm/wireframe.h
M intern/cycles/kernel/textures.h
M intern/cycles/kernel/types.h
M intern/cycles/scene/CMakeLists.txt
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/attribute.cpp
M intern/cycles/scene/geometry.cpp
M intern/cycles/scene/geometry.h
M intern/cycles/scene/object.cpp
A intern/cycles/scene/pointcloud.cpp
A intern/cycles/scene/pointcloud.h
M intern/cycles/scene/scene.cpp
M intern/cycles/scene/scene.h
M intern/cycles/scene/shader_nodes.cpp
M intern/cycles/scene/shader_nodes.h
M intern/eigen/eigen_capi.h
M intern/eigen/intern/eigenvalues.h
M intern/eigen/intern/linear_solver.cc
M intern/eigen/intern/linear_solver.h
M intern/eigen/intern/matrix.cc
M intern/eigen/intern/matrix.h
M intern/eigen/intern/svd.cc
M intern/eigen/intern/svd.h
M intern/ghost/intern/GHOST_SystemPathsCocoa.mm
M intern/ghost/intern/GHOST_SystemX11.cpp
M intern/ghost/intern/GHOST_Window.h
M intern/ghost/intern/GHOST_XrSession.cpp
M intern/glew-mx/glew-mx.h
M intern/glew-mx/intern/gl-deprecated.h
M intern/glew-mx/intern/glew-mx.c
M intern/glew-mx/intern/symbol-binding.h
M intern/guardedalloc/MEM_guardedalloc.h
M intern/guardedalloc/cpp/mallocn.cpp
M intern/guardedalloc/intern/leak_detector.cc
M intern/guardedalloc/intern/mallocn.c
M intern/guardedalloc/intern/mallocn_guarded_impl.c
M intern/guardedalloc/intern/mallocn_inline.h
M intern/guardedalloc/intern/mallocn_intern.h
M intern/guardedalloc/intern/mallocn_lockfree_impl.c
M intern/iksolver/extern/IK_solver.h
M intern/iksolver/intern/IK_Math.h
M intern/iksolver/intern/IK_QJacobian.cpp
M intern/iksolver/intern/IK_QJacobian.h
M intern/iksolver/intern/IK_QJacobianSolver.cpp
M intern/iksolver/intern/IK_QJacobianSolver.h
M intern/iksolver/intern/IK_QSegment.cpp
M intern/iksolver/intern/IK_QSegment.h
M intern/iksolver/intern/IK_QTask.cpp
M intern/iksolver/intern/IK_QTask.h
M intern/iksolver/intern/IK_Solver.cpp
M intern/itasc/Armature.cpp
M intern/itasc/Cache.cpp
M intern/itasc/ConstraintSet.cpp
M intern/itasc/ControlledObject.cpp
M intern/itasc/CopyPose.cpp
M intern/itasc/Distance.cpp
M intern/itasc/FixedObject.cpp
M intern/itasc/MovingFrame.cpp
M intern/itasc/Scene.cpp
M intern/itasc/UncontrolledObject.cpp
M intern/itasc/WDLSSolver.cpp
M intern/itasc/WSDLSSolver.cpp
M intern/itasc/WorldObject.cpp
M intern/itasc/eigen_types.cpp
M intern/itasc/kdl/chain.cpp
M intern/itasc/kdl/chainfksolverpos_recursive.cpp
M intern/itasc/kdl/chainjnttojacsolver.cpp
M intern/itasc/kdl/frameacc.cpp
M intern/itasc/kdl/frames.cpp
M intern/itasc/kdl/frames_io.cpp
M intern/itasc/kdl/framevel.cpp
M intern/itasc/kdl/inertia.cpp
M intern/itasc/kdl/jacobian.cpp
M intern/itasc/kdl/jntarray.cpp
M intern/itasc/kdl/jntarrayacc.cpp
M intern/itasc/kdl/jntarrayvel.cpp
M intern/itasc/kdl/joint.cpp
M intern/itasc/kdl/kinfam_io.cpp
M intern/itasc/kdl/segment.cpp
M intern/itasc/kdl/tree.cpp
M intern/itasc/kdl/treefksolverpos_recursive.cpp
M intern/itasc/kdl/treejnttojacsolver.cpp
M intern/itasc/kdl/utilities/error_stack.cpp
M intern/itasc/kdl/utilities/kdl-config.h
M intern/itasc/kdl/utilities/traits.h
M intern/itasc/kdl/utilities/utility.cpp
M intern/itasc/kdl/utilities/utility_io.cpp
M intern/libc_compat/libc_compat.c
M intern/libmv/intern/utildefines.h
M intern/locale/boost_locale_wrapper.cpp
M intern/locale/boost_locale_wrapper.h
M intern/locale/osx_user_locale.mm
M intern/mantaflow/extern/manta_fluid_API.h
M intern/mantaflow/extern/manta_python_API.h
M intern/mantaflow/intern/MANTA_main.cpp
M intern/mantaflow/intern/MANTA_main.h
M intern/mantaflow/intern/manta_fluid_API.cpp
M intern/mantaflow/intern/manta_python_API.cpp
M intern/mantaflow/intern/strings/fluid_script.h
M intern/mantaflow/intern/strings/liquid_script.h
M intern/mantaflow/intern/strings/smoke_script.h
M intern/memutil/MEM_Allocator.h
M intern/memutil/MEM_CacheLimiter.h
M intern/memutil/MEM_CacheLimiterC-Api.h
M intern/memutil/MEM_RefCounted.h
M intern/memutil/MEM_RefCountedC-Api.h
M intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
M intern/memutil/intern/MEM_RefCountedC-Api.cpp
M intern/numaapi/include/numaapi.h
M intern/numaapi/source/build_config.h
M intern/numaapi/source/numaapi.c
M intern/numaapi/source/numaapi_linux.c
M intern/numaapi/source/numaapi_stub.c
M intern/numaapi/source/numaapi_win32.c
M intern/opencolorio/ocio_impl.cc
M intern/opensubdiv/internal/evaluator/evaluator_capi.cc
M intern/opensubdiv/internal/topology/topology_refiner_capi.cc
M intern/rigidbody/RBI_api.h
M intern/rigidbody/RBI_hull_api.h
M intern/rigidbody/rb_bullet_api.cpp
M intern/rigidbody/rb_convex_hull_api.cpp
M intern/sky/include/sky_model.h
M intern/sky/source/sky_float3.h
M intern/sky/source/sky_model.cpp
M intern/sky/source/sky_model_data.h
M intern/sky/source/sky_nishita.cpp
M intern/utfconv/utf_winfunc.c
M intern/utfconv/utf_winfunc.h
M intern/utfconv/utfconv.c
M intern/utfconv/utfconv.h
M release/scripts/startup/bl_ui/space_topbar.py
M release/scripts/startup/bl_ui/space_userpref.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/BKE_blender_version.h
M source/blender/blenkernel/BKE_blendfile_link_append.h
M source/blender/blenkernel/BKE_bvhutils.h
M source/blender/blenkernel/BKE_displist.h
M source/blender/blenkernel/BKE_fcurve_driver.h
M source/blender/blenkernel/BKE_geometry_set.hh
M source/blender/blenkernel/BKE_geometry_set_instances.hh
M source/blender/blenkernel/BKE_global.h
M source/blender/blenkernel/BKE_gpencil.h
M source/blender/blenkernel/BKE_gpencil_geom.h
M source/blender/blenkernel/BKE_gpencil_modifier.h
M source/blender/blenkernel/BKE_idtype.h
M source/blender/blenkernel/BKE_lattice.h
M source/blender/blenkernel/BKE_lib_override.h
M source/blender/blenkernel/BKE_lib_remap.h
M source/blender/blenkernel/BKE_main.h
M source/blender/blenkernel/BKE_nla.h
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/BKE_particle.h
M source/blender/blenkernel/BKE_pointcloud.h
M source/blender/blenkernel/BKE_shrinkwrap.h
M source/blender/blenkernel/BKE_spline.hh
M source/blender/blenkernel/BKE_type_conversions.hh
M source/blender/blenkernel/BKE_undo_system.h
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/appdir.c
M source/blender/blenkernel/intern/asset_library.cc
M source/blender/blenkernel/intern/attribute_access.cc
M source/blender/blenkernel/intern/blender_undo.c
M source/blender/blenkernel/intern/blender_user_menu.c
M source/blender/blenkernel/intern/blendfile.c
M source/blender/blenkernel/intern/bpath_test.cc
M source/blender/blenkernel/intern/bvhutils.cc
R091 source/blender/blenkernel/intern/curve.c source/blender/blenkernel/intern/curve.cc
M source/blender/blenkernel/intern/curve_eval.cc
M source/blender/blenkernel/intern/curveprofile.cc
M source/blender/blenkernel/intern/displist.cc
M source/blender/blenkernel/intern/displist_tangent.c
M source/blender/blenkernel/intern/fcurve_driver.c
M source/blender/blenkernel/intern/fluid.c
M source/blender/blenkernel/intern/geometry_component_curve.cc
M source/blender/blenkernel/intern/geometry_component_instances.cc
M source/blender/blenkernel/intern/geometry_set.cc
M source/blender/blenkernel/intern/geometry_set_instances.cc
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/gpencil_geom.cc
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/blenkernel/intern/icons.cc
M source/blender/blenkernel/intern/idprop.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/image_gpu.cc
M source/blender/blenkernel/intern/layer.c
M source/blender/blenkernel/intern/layer_utils.c
M source/blender/blenkernel/intern/lib_override.c
M source/blender/blenkernel/intern/library.c
M source/blender/blenkernel/intern/main.c
M source/blender/blenkernel/intern/mball_tessellate.c
M source/blender/blenkernel/intern/mesh_convert.cc
M source/blender/blenkernel/intern/mesh_evaluate.cc
M source/blender/blenkernel/intern/mesh_remap.c
M source/blender/blenkernel/intern/mesh_runtime.c
M source/blender/blenkernel/intern/mesh_validate.c
M source/blender/blenkernel/intern/modifier.c
M source/blender/blenkernel/intern/movieclip.c
M source/blender/blenkernel/intern/node.cc
M source/blender/blenkernel/intern/object.cc
M source/blender/blenkernel/intern/object_deform.c
M source/blender/blenkernel/intern/object_dupli.cc
M source/blender/blenkernel/intern/pointcache.c
M source/blender/blenkernel/intern/shrinkwrap.c
M source/blender/blenkernel/intern/sound.c
M source/blender/blenkernel/intern/type_conversions.cc
M source/blender/blenkernel/intern/undo_system.c
M source/blender/blenkernel/intern/volume.cc
M source/blender/blenkernel/intern/writeffmpeg.c
M source/blender/blenlib/BLI_dlrbTree.h
M source/blender/blenlib/BLI_fileops.h
M source/blender/blenlib/BLI_ghash.h
M source/blender/blenlib/BLI_listbase.h
M source/blender/blenlib/BLI_math_geom.h
M source/blender/blenlib/BLI_math_matrix.h
M source/blender/blenlib/BLI_math_rotation.h
M source/blender/blenlib/BLI_math_time.h
M source/blender/blenlib/BLI_memiter.h
M source/blender/blenlib/BLI_noise.hh
M source/blender/blenlib/BLI_path_util.h
M source/blender/blenlib/BLI_string.h
M source/blender/blenlib/BLI_string_search.h
M source/blender/blenlib/BLI_string_utf8.h
M source/blender/blenlib/BLI_string_utils.h
M source/blender/blenlib/BLI_timecode.h
M source/blender/blenlib/intern/BLI_ghash.c
M source/blender/blenlib/intern/boxpack_2d.c
M source/blender/blenlib/intern/listbase.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenlib/intern/math_matrix.c
M source/blender/blenlib/intern/noise.cc
M source/blender/blenlib/intern/path_util.c
M source/blender/blenlib/intern/storage_apple.mm
M source/blender/blenlib/intern/string.c
M source/blender/blenlib/intern/string_search.cc
M source/blender/blenlib/intern/task_scheduler.cc
M source/blender/blenlib/tests/BLI_color_test.cc
M source/blender/blenlib/tests/BLI_listbase_test.cc
M source/blender/blenloader/BLO_readfile.h
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/readfile_tempload.c
M source/blender/blenloader/intern/versioning_300.c
M source/blender/blenloader/intern/writefile.c
M source/blender/bmesh/intern/bmesh_mesh_partial_update.h
M source/blender/bmesh/intern/bmesh_polygon_edgenet.h
M source/blender/bmesh/intern/bmesh_query.h
M source/blender/bmesh/intern/bmesh_walkers_impl.c
M source/blender/bmesh/operators/bmo_connect_pair.c
M source/blender/bmesh/tools/bmesh_bisect_plane.c
M source/blender/bmesh/tools/bmesh_path.c
M source/blender/bmesh/tools/bmesh_path_uv.c
M source/blender/bmesh/tools/bmesh_region_match.c
M source/blender/compositor/COM_compositor.h
M source/blender/compositor/intern/COM_MemoryProxy.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes.h
M source/blender/draw/engines/eevee/eevee_lightprobes.c
M source/blender/draw/engines/eevee/eevee_shaders.c
M source/blender/draw/engines/overlay/overlay_armature.c
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_cache_extract_mesh.cc
M source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
M source/blender/draw/intern/draw_cache_impl_gpencil.c
M source/blender/draw/intern/draw_cache_impl_metaball.c
M source/blender/draw/intern/draw_instance_data.c
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/intern/draw_select_buffer.c
M source/blender/draw/intern/draw_view.c
M source/blender/draw/intern/mesh_extractors/extract_mesh.h
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_nor.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc
M source/blender/editors/animation/drivers.c
M source/blender/editors/animation/keyframes_general.c
M source/blender/editors/armature/armature_intern.h
M source/blender/editors/armature/pose_transform.c
M source/blender/editors/asset/intern/asset_catalog.cc
M source/blender/editors/asset/intern/asset_indexer.cc
M source/blender/editors/asset/intern/asset_list.cc
M source/blender/editors/asset/intern/asset_ops.cc
M source/blender/editors/asset/intern/asset_temp_id_consumer.cc
M source/blender/editors/curve/editcurve.c
M source/blender/editors/curve/editfont.c
M source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_edit_curve.c
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/gpencil/gpencil_interpolate.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/gpencil/gpencil_sculpt_paint.c
M source/blender/editors/gpencil/gpencil_select.c
M source/blender/editors/include/ED_gpencil.h
M source/blender/editors/include/ED_keyframes_edit.h
M source/blender/editors/include/ED_mesh.h
M source/blender/editors/include/ED_render.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/include/UI_interface.h
M source/blender/editors/include/UI_view2d.h
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_context_path.cc
M source/blender/editors/interface/interface_eyedropper.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_ops.c
M source/blender/editors/interface/interface_region_hud.c
M source/blender/editors/interface/interface_region_menu_pie.c
M source/blender/editors/interface/interface_template_attribute_search.cc
M source/blender/editors/interface/interface_template_search_menu.cc
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/interface/interface_utils.c
M source/blender/editors/interface/interface_view.cc
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/interface/view2d.c
M source/blender/editors/lattice/editlattice_tools.c
M source/blender/editors/mesh/editmesh_preselect_elem.c
M source/blender/editors/mesh/editmesh_select_similar.c
M source/blender/editors/object/object_add.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_modifier.c
M source/blender/editors/object/object_shader_fx.c
M source/blender/editors/render/render_preview.c
M source/blender/editors/render/render_shading.c
M source/blender/editors/screen/screen_intern.h
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/screen/screendump.c
M source/blender/editors/screen/workspace_edit.c
M source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_detail.c
M source/blender/editors/space_clip/clip_ops.c
M source/blender/editors/space_file/asset_catalog_tree_view.cc
M source/blender/editors/space_file/file_ops.c
M source/blender/editors/space_file/filelist.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_info/info_ops.c
M source/blender/editors/space_node/CMakeLists.txt
M source/blender/editors/space_node/drawnode.cc
A source/blender/editors/space_node/link_drag_search.cc
M source/blender/editors/space_node/node_draw.cc
M source/blender/editors/space_node/node_geometry_attribute_search.cc
M source/blender/editors/space_node/node_intern.hh
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
M source/blender/editors/space_node/space_node.cc
M source/blender/editors/space_outliner/outliner_dragdrop.c
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/editors/space_outliner/outliner_edit.c
M source/blender/editors/space_spreadsheet/CMakeLists.txt
M source/blender/editors/space_spreadsheet/space_spreadsheet.cc
D source/blender/editors/space_spreadsheet/spreadsheet_cell_value.hh
M source/blender/editors/space_spreadsheet/spreadsheet_column.cc
M source/blender/editors/space_spreadsheet/spreadsheet_column_values.hh
M source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
M source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.hh
M source/blender/editors/space_spreadsheet/spreadsheet_layout.cc
M source/blender/editors/space_spreadsheet/spreadsheet_layout.hh
M source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc
M source/blender/editors/space_spreadsheet/spreadsheet_row_filter.hh
M source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc
M source/blender/editors/space_topbar/space_topbar.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_convert_mesh.c
M source/blender/editors/transform/transform_convert_mesh_skin.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_mode.c
M source/blender/editors/transform/transform_mode_align.c
M source/blender/editors/transform/transform_mode_baketime.c
M source/blender/editors/transform/transform_mode_bbone_resize.c
M source/blender/editors/transform/transform_mode_bend.c
M source/blender/editors/transform/transform_mode_boneroll.c
M source/blender/editors/transform/transform_mode_curveshrinkfatten.c
M source/blender/editors/transform/transform_mode_edge_bevelweight.c
M source/blender/editors/transform/transform_mode_edge_rotate_normal.c
M source/blender/editors/transform/transform_mode_edge_slide.c
M source/blender/editors/transform/transform_mode_gpopacity.c
M source/blender/editors/transform/transform_mode_gpshrinkfatten.c
M source/blender/editors/transform/transform_mode_maskshrinkfatten.c
M source/blender/editors/transform/transform_mode_mirror.c
M source/blender/editors/transform/transform_mode_push_pull.c
M source/blender/editors/transform/transform_mode_resize.c
M source/blender/editors/transform/transform_mode_rotate.c
M source/blender/editors/transform/transform_mode_shear.c
M source/blender/editors/transform/transform_mode_shrink_fatten.c
M source/blender/editors/transform/transform_mode_skin_resize.c
M source/blender/editors/transform/transform_mode_tilt.c
M source/blender/editors/transform/transform_mode_timescale.c
M source/blender/editors/transform/transform_mode_timeslide.c
M source/blender/editors/transform/transform_mode_timetranslate.c
M source/blender/editors/transform/transform_mode_tosphere.c
M source/blender/editors/transform/transform_mode_trackball.c
M source/blender/editors/transform/transform_mode_translate.c
M source/blender/editors/transform/transform_mode_vert_slide.c
M source/blender/editors/transform/transform_snap.c
M source/blender/editors/transform/transform_snap_object.c
M source/blender/editors/undo/ed_undo.c
M source/blender/editors/util/ed_util.c
M source/blender/editors/uvedit/uvedit_unwrap_ops.c
M source/blender/freestyle/intern/image/GaussianFilter.h
M source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h
M source/blender/freestyle/intern/system/PythonInterpreter.h
M source/blender/freestyle/intern/winged_edge/Curvature.h
M source/blender/functions/CMakeLists.txt
M source/blender/functions/FN_field.hh
M source/blender/functions/FN_generic_virtual_array.hh
A source/blender/functions/FN_multi_function_procedure_optimization.hh
M source/blender/functions/intern/field.cc
M source/blender/functions/intern/multi_function_procedure_executor.cc
A source/blender/functions/intern/multi_function_procedure_optimization.cc
M source/blender/geometry/CMakeLists.txt
A source/blender/geometry/GEO_realize_instances.hh
A source/blender/geometry/intern/realize_instances.cc
M source/blender/gpencil_modifiers/CMakeLists.txt
M source/blender/gpencil_modifiers/MOD_gpencil_modifiertypes.h
M source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
M source/blender/gpencil_modifiers/intern/MOD_gpencillength.c
A source/blender/gpencil_modifiers/intern/MOD_gpencilshrinkwrap.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
M source/blender/gpu/GPU_immediate_util.h
M source/blender/gpu/GPU_state.h
M source/blender/gpu/intern/gpu_buffers.c
M source/blender/gpu/intern/gpu_immediate_util.c
M source/blender/gpu/intern/gpu_matrix.cc
M source/blender/gpu/intern/gpu_shader_interface.cc
M source/blender/gpu/opengl/gl_batch.cc
M source/blender/gpu/opengl/gl_drawlist.cc
M source/blender/gpu/opengl/gl_state.hh
M source/blender/gpu/shaders/material/gpu_shader_material_map_range.glsl
M source/blender/imbuf/IMB_imbuf.h
M source/blender/imbuf/IMB_imbuf_types.h
M source/blender/imbuf/intern/IMB_filetype.h
M source/blender/imbuf/intern/imageprocess.c
M source/blender/imbuf/intern/openexr/openexr_multi.h
M source/blender/imbuf/intern/transform.cc
M source/blender/io/alembic/exporter/abc_archive.cc
M source/blender/makesdna/DNA_curve_types.h
M source/blender/makesdna/DNA_fileglobal_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_node_types.h
M source/blender/makesdna/DNA_scene_defaults.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/intern/dna_defaults.c
M source/blender/makesdna/intern/dna_rename_defs.h
M source/blender/makesrna/RNA_enum_items.h
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_access_compare_override.c
M source/blender/makesrna/intern/rna_curve.c
M source/blender/makesrna/intern/rna_fcurve.c
M source/blender/makesrna/intern/rna_gpencil_modifier.c
M source/blender/makesrna/intern/rna_main.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_texture_api.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/modifiers/CMakeLists.txt
M source/blender/modifiers/intern/MOD_nodes.cc
M source/blender/modifiers/intern/MOD_solidify_extrude.c
R063 source/blender/modifiers/intern/MOD_weld.c source/blender/modifiers/intern/MOD_weld.cc
M source/blender/nodes/CMakeLists.txt
M source/blender/nodes/NOD_derived_node_tree.hh
M source/blender/nodes/NOD_geometry.h
M source/blender/nodes/NOD_geometry_exec.hh
M source/blender/nodes/NOD_node_declaration.hh
M source/blender/nodes/NOD_socket_declarations.hh
M source/blender/nodes/NOD_socket_declarations_geometry.hh
A source/blender/nodes/NOD_socket_search_link.hh
M source/blender/nodes/NOD_static_types.h
M source/blender/nodes/composite/node_composite_util.cc
M source/blender/nodes/composite/node_composite_util.hh
M source/blender/nodes/composite/nodes/node_composite_alphaOver.cc
M source/blender/nodes/composite/nodes/node_composite_antialiasing.cc
M source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc
M source/blender/nodes/composite/nodes/node_composite_blur.cc
M source/blender/nodes/composite/nodes/node_composite_bokehblur.cc
M source/blender/nodes/composite/nodes/node_composite_bokehimage.cc
M source/blender/nodes/composite/nodes/node_composite_boxmask.cc
M source/blender/nodes/composite/nodes/node_composite_brightness.cc
M source/blender/nodes/composite/nodes/node_composite_channelMatte.cc
M source/blender/nodes/composite/nodes/node_composite_chromaMatte.cc
M source/blender/nodes/composite/nodes/node_composite_colorMatte.cc
M source/blender/nodes/composite/nodes/node_composite_colorSpill.cc
M source/blender/nodes/composite/nodes/node_composite_colorbalance.cc
M source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc
M source/blender/nodes/composite/nodes/node_composite_common.cc
M source/blender/nodes/composite/nodes/node_composite_composite.cc
M source/blender/nodes/composite/nodes/node_composite_crop.cc
M source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
M source/blender/nodes/composite/nodes/node_composite_curves.cc
M source/blender/nodes/composite/nodes/node_composite_defocus.cc
M source/blender/nodes/composite/nodes/node_composite_denoise.cc
M source/blender/nodes/composite/nodes/node_composite_despeckle.cc
M source/blender/nodes/composite/nodes/node_composite_diffMatte.cc
M source/blender/nodes/composite/nodes/node_composite_dilate.cc
M source/blender/nodes/composite/nodes/node_composite_directionalblur.cc
M source/blender/nodes/composite/nodes/node_composite_distanceMatte.cc
M source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.cc
M source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc
M source/blender/nodes/composite/nodes/node_composite_filter.cc
M source/blender/nodes/composite/nodes/node_composite_flip.cc
M source/blender/nodes/composite/nodes/node_composite_glare.cc
M source/blender/nodes/composite/nodes/node_composite_idMask.cc
M source/blender/nodes/composite/nodes/node_composite_image.cc
M source/blender/nodes/composite/nodes/node_composite_inpaint.cc
M source/blender/nodes/composite/nodes/node_composite_invert.cc
M source/blender/nodes/composite/nodes/node_composite_keying.cc
M source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc
M source/blender/nodes/composite/nodes/node_composite_lensdist.cc
M source/blender/nodes/composite/nodes/node_composite_levels.cc
M source/blender/nodes/composite/nodes/node_composite_lummaMatte.cc
M source/blender/nodes/composite/nodes/node_composite_mapRange.cc
M source/blender/nodes/composite/nodes/node_composite_mapUV.cc
M source/blender/nodes/composite/nodes/node_composite_mapValue.cc
M source/blender/nodes/composite/nodes/node_composite_mask.cc
M source/blender/nodes/composite/nodes/node_composite_math.cc
M source/blender/nodes/composite/nodes/node_composite_mixrgb.cc
M source/blender/nodes/composite/nodes/node_composite_movieclip.cc
M source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc
M source/blender/nodes/composite/nodes/node_composite_outputFile.cc
M source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc
M source/blender/nodes/composite/nodes/node_composite_premulkey.cc
M source/blender/nodes/composite/nodes/node_composite_rotate.cc
M source/blender/nodes/composite/nodes/node_composite_scale.cc
M source/blender/nodes/composite/nodes/node_composite_setalpha.cc
M source/blender/nodes/composite/nodes/node_composite_splitViewer.cc
M source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc
M source/blender/nodes/composite/nodes/node_composite_sunbeams.cc
M source/blender/nodes/composite/nodes/node_composite_switch.cc
M source/blender/nodes/composite/nodes/node_composite_switchview.cc
M source/blender/nodes/composite/nodes/node_composite_tonemap.cc
M source/blender/nodes/composite/nodes/node_composite_trackpos.cc
M source/blender/nodes/composite/nodes/node_composite_transform.cc
M source/blender/nodes/composite/nodes/node_composite_translate.cc
M source/blender/nodes/composite/nodes/node_composite_vecBlur.cc
M source/blender/nodes/composite/nodes/node_composite_viewer.cc
M source/blender/nodes/composite/nodes/node_composite_zcombine.cc
M source/blender/nodes/function/node_function_util.cc
M source/blender/nodes/function/nodes/node_fn_boolean_math.cc
M source/blender/nodes/function/nodes/node_fn_compare.cc
M source/blender/nodes/function/nodes/node_fn_float_to_int.cc
M source/blender/nodes/function/nodes/node_fn_random_value.cc
M source/blender/nodes/geometry/node_geometry_tree.cc
M source/blender/nodes/geometry/node_geometry_util.cc
M source/blender/nodes/geometry/node_geometry_util.hh
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_align_rotation_to_vector.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_clamp.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_color_ramp.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_combine_xyz.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_compare.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_convert.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_curve_map.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_fill.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_map_range.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_math.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_mix.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_proximity.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_randomize.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_sample_texture.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_separate_xyz.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_transfer.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_vector_math.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_attribute_vector_rotate.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_endpoints.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_reverse.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_select_by_handle_type.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_set_handles.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_spline_type.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_subdivide.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_to_points.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_delete_geometry.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_edge_split.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_material_assign.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_mesh_to_curve.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_point_instance.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_point_rotate.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_point_scale.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_point_separate.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_point_translate.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_points_to_volume.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_raycast.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_select_by_material.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_subdivision_surface.cc
M source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_volume_to_mesh.cc
M source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc
M source/blender/nodes/geometry/nodes/node_geo_attribute_domain_size.cc
M source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc
M source/blender/nodes/geometry/nodes/node_geo_common.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_primitive_circle.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_set_handles.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
M source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
M source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc
M source/blender/nodes/geometry/nodes/node_geo_image_texture.cc
M source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc
M source/blender/nodes/geometry/nodes/node_geo_instances_to_points.cc
M source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc
M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc
M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc
M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc
M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
M source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc
M source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc
M source/blender/nodes/geometry/nodes/node_geo_raycast.cc
M source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc
M source/blender/nodes/geometry/nodes/node_geo_rotate_instances.cc
M source/blender/nodes/geometry/nodes/node_geo_scale_instances.cc
M source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc
M source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc
M source/blender/nodes/geometry/nodes/node_geo_set_curve_radius.cc
M source/blender/nodes/geometry/nodes/node_geo_set_curve_tilt.cc
M source/blender/nodes/geometry/nodes/node_geo_set_id.cc
M source/blender/nodes/geometry/nodes/node_geo_set_material.cc
M source/blender/nodes/geometry/nodes/node_geo_set_material_index.cc
M source/blender/nodes/geometry/nodes/node_geo_set_point_radius.cc
M source/blender/nodes/geometry/nodes/node_geo_set_position.cc
M source/blender/nodes/geometry/nodes/node_geo_set_shade_smooth.cc
M source/blender/nodes/geometry/nodes/node_geo_set_spline_cyclic.cc
M source/blender/nodes/geometry/nodes/node_geo_set_spline_resolution.cc
M source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc
M source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
M source/blender/nodes/geometry/nodes/node_geo_switch.cc
M source/blender/nodes/geometry/nodes/node_geo_transfer_attribute.cc
M source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc
M source/blender/nodes/geometry/nodes/node_geo_viewer.cc
M source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
M source/blender/nodes/intern/node_common.cc
M source/blender/nodes/intern/node_common.h
M source/blender/nodes/intern/node_declaration.cc
M source/blender/nodes/intern/node_socket.cc
M source/blender/nodes/intern/node_socket_declarations.cc
M source/blender/nodes/intern/node_util.c
M source/blender/nodes/intern/node_util.h
A source/blender/nodes/intern/socket_search_link.cc
M source/blender/nodes/shader/node_shader_tree.c
M source/blender/nodes/shader/node_shader_util.cc
M source/blender/nodes/shader/nodes/node_shader_common.c
M source/blender/nodes/shader/nodes/node_shader_map_range.cc
M source/blender/nodes/shader/nodes/node_shader_math.cc
M source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc
M source/blender/nodes/shader/nodes/node_shader_tex_environment.c
M source/blender/nodes/shader/nodes/node_shader_tex_image.cc
M source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc
M source/blender/nodes/shader/nodes/node_shader_tex_noise.cc
M source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc
M source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc
M source/blender/nodes/shader/nodes/node_shader_vector_math.cc
M source/blender/nodes/texture/nodes/node_texture_common.c
M source/blender/nodes/texture/nodes/node_texture_image.c
M source/blender/nodes/texture/nodes/node_texture_math.c
M source/blender/nodes/texture/nodes/node_texture_mixRgb.c
M source/blender/python/BPY_extern_run.h
M source/blender/python/generic/idprop_py_api.c
M source/blender/python/generic/py_capi_utils.h
M source/blender/python/gpu/gpu_py.c
M source/blender/python/gpu/gpu_py_select.c
M source/blender/python/gpu/gpu_py_texture.c
M source/blender/python/intern/bpy_app_translations.c
M source/blender/python/intern/bpy_interface_run.c
M source/blender/python/intern/bpy_props.c
M source/blender/python/intern/bpy_rna_anim.c
M source/blender/python/intern/bpy_rna_data.c
M source/blender/render/RE_texture.h
M source/blender/render/intern/pipeline.c
M source/blender/sequencer/SEQ_add.h
M source/blender/sequencer/SEQ_edit.h
M source/blender/sequencer/SEQ_iterator.h
M source/blender/sequencer/SEQ_relations.h
M source/blender/sequencer/intern/disk_cache.c
M source/blender/sequencer/intern/render.c
M source/blender/sequencer/intern/sequencer.c
M source/blender/sequencer/intern/strip_relations.c
M source/blender/simulation/intern/ConstrainedConjugateGradient.h
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
M source/blender/windowmanager/intern/wm_draw.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_files_link.c
M source/blender/windowmanager/intern/wm_gesture_ops.c
M source/blender/windowmanager/intern/wm_init_exit.c
M source/blender/windowmanager/intern/wm_keymap.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_surface.c
M source/blender/windowmanager/intern/wm_window.c
M source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
M source/blender/windowmanager/wm_event_types.h
M source/blender/windowmanager/wm_surface.h
M source/blender/windowmanager/xr/intern/wm_xr_session.c
M source/creator/creator.c
M source/creator/creator_args.c
M source/creator/creator_signals.c
M tests/python/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59d07fd1a74..5c5b5eb317e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -463,6 +463,11 @@ if(NOT APPLE)
mark_as_advanced(CYCLES_HIP_BINARIES_ARCH)
endif()
+# Apple Metal
+if(APPLE)
+ option(WITH_CYCLES_DEVICE_METAL "Enable Cycles Apple Metal compute support" ON)
+endif()
+
# Draw Manager
option(WITH_DRAW_DEBUG "Add extra debug capabilities to Draw Manager" OFF)
mark_as_advanced(WITH_DRAW_DEBUG)
diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake
index 04074db688d..da8724071b7 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -61,6 +61,7 @@ set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE)
# platform dependent options
if(APPLE)
set(WITH_COREAUDIO ON CACHE BOOL "" FORCE)
+ set(WITH_CYCLES_DEVICE_METAL ON CACHE BOOL "" FORCE)
endif()
if(NOT WIN32)
set(WITH_JACK ON CACHE BOOL "" FORCE)
diff --git a/doc/doxygen/doxygen.intern.h b/doc/doxygen/doxygen.intern.h
index b08b868a7e3..b6145e22a90 100644
--- a/doc/doxygen/doxygen.intern.h
+++ b/doc/doxygen/doxygen.intern.h
@@ -6,91 +6,90 @@
* as part of the normal development process.
*/
-/** \defgroup MEM Guarded memory (de)allocation
- * \ingroup intern
+/* TODO: other modules.
+ * - `libmv`
+ * - `cycles`
+ * - `opencolorio`
+ * - `opensubdiv`
+ * - `openvdb`
+ * - `quadriflow`
*/
-/** \defgroup clog C-Logging (CLOG)
- * \ingroup intern
- */
+/** \defgroup intern_atomic Atomic Operations
+ * \ingroup intern */
-/** \defgroup ctr container
- * \ingroup intern
- */
+/** \defgroup intern_clog C-Logging (CLOG)
+ * \ingroup intern */
-/** \defgroup iksolver iksolver
- * \ingroup intern
- */
+/** \defgroup intern_eigen Eigen
+ * \ingroup intern */
-/** \defgroup itasc itasc
- * \ingroup intern
- */
+/** \defgroup intern_glew-mx GLEW with Multiple Rendering Context's
+ * \ingroup intern */
-/** \defgroup memutil memutil
- * \ingroup intern
- */
+/** \defgroup intern_iksolver Inverse Kinematics (Solver)
+ * \ingroup intern */
-/** \defgroup mikktspace mikktspace
- * \ingroup intern
- */
+/** \defgroup intern_itasc Inverse Kinematics (ITASC)
+ * \ingroup intern */
-/** \defgroup moto moto
- * \ingroup intern
- */
+/** \defgroup intern_libc_compat libc Compatibility For Linux
+ * \ingroup intern */
-/** \defgroup eigen eigen
- * \ingroup intern
- */
+/** \defgroup intern_locale Locale
+ * \ingroup intern */
-/** \defgroup smoke smoke
- * \ingroup intern
- */
+/** \defgroup intern_mantaflow Manta-Flow Fluid Simulation
+ * \ingroup intern */
-/** \defgroup string string
- * \ingroup intern
- */
+/** \defgroup intern_mem Guarded Memory (de)allocation
+ * \ingroup intern */
+
+/** \defgroup intern_memutil Memory Utilities (memutil)
+ * \ingroup intern */
+
+/** \defgroup intern_mikktspace MikktSpace
+ * \ingroup intern */
+
+/** \defgroup intern_numaapi NUMA (Non Uniform Memory Architecture)
+ * \ingroup intern */
+
+/** \defgroup intern_rigidbody Rigid-Body C-API
+ * \ingroup intern */
+
+/** \defgroup intern_sky_model Sky Model
+ * \ingroup intern */
+
+/** \defgroup intern_utf_conv UTF-8/16 Conversion (utfconv)
+ * \ingroup intern */
/** \defgroup audaspace Audaspace
* \ingroup intern undoc
- * \todo add to doxygen
- */
+ * \todo add to doxygen */
/** \defgroup audcoreaudio Audaspace CoreAudio
- * \ingroup audaspace
- */
+ * \ingroup audaspace */
/** \defgroup audfx Audaspace FX
- * \ingroup audaspace
- */
+ * \ingroup audaspace */
/** \defgroup audopenal Audaspace OpenAL
- * \ingroup audaspace
- */
+ * \ingroup audaspace */
/** \defgroup audpulseaudio Audaspace PulseAudio
- * \ingroup audaspace
- */
+ * \ingroup audaspace */
/** \defgroup audwasapi Audaspace WASAPI
- * \ingroup audaspace
- */
+ * \ingroup audaspace */
/** \defgroup audpython Audaspace Python
- * \ingroup audaspace
- */
+ * \ingroup audaspace */
/** \defgroup audsdl Audaspace SDL
- * \ingroup audaspace
- */
+ * \ingroup audaspace */
/** \defgroup audsrc Audaspace SRC
- *
- * \ingroup audaspace
- */
+ * \ingroup audaspace */
/** \defgroup audffmpeg Audaspace FFMpeg
- * \ingroup audaspace
- */
+ * \ingroup audaspace */
/** \defgroup audfftw Audaspace FFTW
- * \ingroup audaspace
- */
+ * \ingroup audaspace */
/** \defgroup audjack Audaspace Jack
- * \ingroup audaspace
- */
+ * \ingroup audaspace */
/** \defgroup audsndfile Audaspace sndfile
- * \ingroup audaspace
- */
+ * \ingroup audaspace */
/** \defgroup GHOST GHOST API
* \ingroup intern GUI
diff --git a/doc/doxygen/doxygen.source.h b/doc/doxygen/doxygen.source.h
index 510f3fe8ffe..4e351c9cc04 100644
--- a/doc/doxygen/doxygen.source.h
+++ b/doc/doxygen/doxygen.source.h
@@ -5,7 +5,8 @@
/** \defgroup bmesh BMesh
* \ingroup blender
*/
-/** \defgroup compositor Compositing */
+/** \defgroup compositor Compositing
+ * \ingroup blender */
/** \defgroup python Python
* \ingroup blender
@@ -78,7 +79,8 @@
* \ingroup blender
*/
-/** \defgroup data DNA, RNA and .blend access*/
+/** \defgroup data DNA, RNA and .blend access
+ * \ingroup blender */
/** \defgroup gpu GPU
* \ingroup blender
@@ -101,11 +103,12 @@
* merged in docs.
*/
-/** \defgroup gui GUI */
+/**
+ * \defgroup gui GUI
+ * \ingroup blender */
/** \defgroup wm Window Manager
- * \ingroup blender gui
- */
+ * \ingroup gui */
/* ================================ */
@@ -279,7 +282,8 @@
* \ingroup gui
*/
-/** \defgroup externformats External Formats */
+/** \defgroup externformats External Formats
+ * \ingroup blender */
/** \defgroup collada COLLADA
* \ingroup externformats
@@ -308,4 +312,7 @@
/* ================================ */
/** \defgroup undoc Undocumented
- * \brief Modules and libraries that are still undocumented, or lacking proper integration into the doxygen system, are marked in this group. */
+ *
+ * \brief Modules and libraries that are still undocumented,
+ * or lacking proper integration into the doxygen system, are marked in this group.
+ */
diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h
index ad404c756ce..6a4d6d263c0 100644
--- a/intern/atomic/atomic_ops.h
+++ b/intern/atomic/atomic_ops.h
@@ -45,7 +45,7 @@
*/
/** \file
- * \ingroup Atomic
+ * \ingroup intern_atomic
*
* \brief Provides wrapper around system-specific atomic primitives,
* and some extensions (faked-atomic operations over float numbers).
diff --git a/intern/atomic/intern/atomic_ops_ext.h b/intern/atomic/intern/atomic_ops_ext.h
index 4dbc1153506..aedf0985169 100644
--- a/intern/atomic/intern/atomic_ops_ext.h
+++ b/intern/atomic/intern/atomic_ops_ext.h
@@ -44,6 +44,10 @@
* The Original Code is: adapted from jemalloc.
*/
+/** \file
+ * \ingroup intern_atomic
+ */
+
#ifndef __ATOMIC_OPS_EXT_H__
#define __ATOMIC_OPS_EXT_H__
diff --git a/intern/atomic/intern/atomic_ops_msvc.h b/intern/atomic/intern/atomic_ops_msvc.h
index 9ed8f8e6295..ea5ae666db9 100644
--- a/intern/atomic/intern/atomic_ops_msvc.h
+++ b/intern/atomic/intern/atomic_ops_msvc.h
@@ -26,6 +26,10 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/** \file
+ * \ingroup intern_atomic
+ */
+
#ifndef __ATOMIC_OPS_MSVC_H__
#define __ATOMIC_OPS_MSVC_H__
diff --git a/intern/atomic/intern/atomic_ops_unix.h b/intern/atomic/intern/atomic_ops_unix.h
index dcafbc67949..2fcfe34d03c 100644
--- a/intern/atomic/intern/atomic_ops_unix.h
+++ b/intern/atomic/intern/atomic_ops_unix.h
@@ -44,6 +44,10 @@
* The Original Code is: adapted from jemalloc.
*/
+/** \file
+ * \ingroup intern_atomic
+ */
+
#ifndef __ATOMIC_OPS_UNIX_H__
#define __ATOMIC_OPS_UNIX_H__
diff --git a/intern/atomic/intern/atomic_ops_utils.h b/intern/atomic/intern/atomic_ops_utils.h
index 01f4284284a..533cfbe9e1f 100644
--- a/intern/atomic/intern/atomic_ops_utils.h
+++ b/intern/atomic/intern/atomic_ops_utils.h
@@ -44,6 +44,10 @@
* The Original Code is: adapted from jemalloc.
*/
+/** \file
+ * \ingroup intern_atomic
+ */
+
#ifndef __ATOMIC_OPS_UTILS_H__
#define __ATOMIC_OPS_UTILS_H__
diff --git a/intern/clog/CLG_log.h b/intern/clog/CLG_log.h
index 8a26eb035cf..3664ade2981 100644
--- a/intern/clog/CLG_log.h
+++ b/intern/clog/CLG_log.h
@@ -14,11 +14,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __CLG_LOG_H__
-#define __CLG_LOG_H__
-
/** \file
- * \ingroup clog
+ * \ingroup intern_clog
*
* C Logging Library (clog)
* ========================
@@ -68,6 +65,9 @@
* - 4+: May be used for more details than 3, should be avoided but not prevented.
*/
+#ifndef __CLG_LOG_H__
+#define __CLG_LOG_H__
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
diff --git a/intern/clog/clog.c b/intern/clog/clog.c
index 3501197511a..88cc0fbc4cb 100644
--- a/intern/clog/clog.c
+++ b/intern/clog/clog.c
@@ -15,7 +15,7 @@
*/
/** \file
- * \ingroup clog
+ * \ingroup intern_clog
*/
#include <assert.h>
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index 1f05b1aa234..fe7d0b89bb0 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -40,6 +40,7 @@ set(SRC
object_cull.cpp
output_driver.cpp
particles.cpp
+ pointcloud.cpp
curves.cpp
logging.cpp
python.cpp
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 0b1a86dfdc1..a7deae2c05d 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -1473,6 +1473,8 @@ class CyclesPreferences(bpy.types.AddonPreferences):
col.label(text="Requires discrete AMD GPU with RDNA architecture", icon='BLANK1')
if sys.platform[:3] == "win":
col.label(text="and AMD Radeon Pro 21.Q4 driver or newer", icon='BLANK1')
+ elif device_type == 'METAL':
+ col.label(text="Requires Apple Silicon and macOS 12.0 or newer", icon='BLANK1')
return
for device in devices:
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addo
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list