[Bf-blender-cvs] [e0039cb3027] sculpt-dev: Merge with master
Joseph Eagar
noreply at git.blender.org
Tue Dec 21 17:35:07 CET 2021
Commit: e0039cb3027a06cee7b50b35ac603ffaad0932f7
Author: Joseph Eagar
Date: Mon Dec 20 14:31:59 2021 -0500
Branches: sculpt-dev
https://developer.blender.org/rBe0039cb3027a06cee7b50b35ac603ffaad0932f7
Merge with master
===================================================================
M build_files/build_environment/install_deps.sh
M build_files/build_environment/patches/usd.diff
M intern/cycles/blender/CMakeLists.txt
M intern/cycles/blender/addon/ui.py
M intern/cycles/blender/geometry.cpp
M intern/cycles/blender/object.cpp
M intern/cycles/blender/session.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/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/bvh/unaligned.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/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/closure/bsdf.h
M intern/cycles/kernel/closure/bsdf_hair_principled.h
M intern/cycles/kernel/device/metal/kernel.metal
M intern/cycles/kernel/device/optix/kernel.cu
M intern/cycles/kernel/geom/attribute.h
M intern/cycles/kernel/geom/curve.h
M intern/cycles/kernel/geom/curve_intersect.h
M intern/cycles/kernel/geom/geom.h
M intern/cycles/kernel/geom/primitive.h
M intern/cycles/kernel/geom/shader_data.h
M intern/cycles/kernel/integrator/shade_surface.h
M intern/cycles/kernel/light/sample.h
M intern/cycles/kernel/osl/services.cpp
M intern/cycles/kernel/osl/services.h
M intern/cycles/kernel/svm/bevel.h
M intern/cycles/kernel/svm/closure.h
M intern/cycles/kernel/svm/geometry.h
M intern/cycles/kernel/svm/tex_coord.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
M intern/cycles/scene/scene.cpp
M intern/cycles/scene/scene.h
M intern/libmv/intern/utildefines.h
M intern/opencolorio/ocio_impl.cc
M intern/opensubdiv/internal/evaluator/evaluator_capi.cc
M intern/opensubdiv/internal/topology/topology_refiner_capi.cc
M release/scripts/addons
M release/scripts/addons_contrib
M release/scripts/startup/bl_ui/space_topbar.py
M source/blender/blenkernel/BKE_fcurve_driver.h
M source/blender/blenkernel/BKE_global.h
M source/blender/blenkernel/BKE_main.h
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/BKE_undo_system.h
M source/blender/blenkernel/CMakeLists.txt
D source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/curveprofile.cc
M source/blender/blenkernel/intern/displist.cc
M source/blender/blenkernel/intern/fcurve_driver.c
M source/blender/blenkernel/intern/geometry_component_instances.cc
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/lib_override.c
M source/blender/blenkernel/intern/mball_tessellate.c
M source/blender/blenkernel/intern/mesh_convert.cc
M source/blender/blenkernel/intern/modifier.c
M source/blender/blenkernel/intern/node.cc
M source/blender/blenkernel/intern/object_dupli.cc
M source/blender/blenkernel/intern/pointcache.c
M source/blender/blenkernel/intern/spline_nurbs.cc
M source/blender/blenkernel/intern/undo_system.c
M source/blender/blenkernel/intern/volume.cc
M source/blender/blenlib/BLI_assert.h
M source/blender/blenlib/BLI_color.hh
M source/blender/blenlib/BLI_compiler_compat.h
M source/blender/blenlib/BLI_delaunay_2d.h
M source/blender/blenlib/BLI_dlrbTree.h
M source/blender/blenlib/BLI_endian_switch.h
M source/blender/blenlib/BLI_endian_switch_inline.h
M source/blender/blenlib/BLI_filereader.h
M source/blender/blenlib/BLI_ghash.h
M source/blender/blenlib/BLI_kdtree_impl.h
M source/blender/blenlib/BLI_linklist_lockfree.h
M source/blender/blenlib/BLI_listbase.h
M source/blender/blenlib/BLI_math_base.h
M source/blender/blenlib/BLI_math_bits.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_vector.h
M source/blender/blenlib/BLI_mempool.h
M source/blender/blenlib/BLI_path_util.h
M source/blender/blenlib/BLI_quadric.h
M source/blender/blenlib/BLI_scanfill.h
M source/blender/blenlib/BLI_session_uuid.h
M source/blender/blenlib/BLI_sort.h
M source/blender/blenlib/BLI_sys_types.h
M source/blender/blenlib/BLI_system.h
M source/blender/blenlib/BLI_task.h
M source/blender/blenlib/BLI_threads.h
M source/blender/blenlib/BLI_timer.h
M source/blender/blenlib/BLI_vector.hh
M source/blender/blenlib/BLI_virtual_array.hh
M source/blender/blenlib/BLI_virtual_vector_array.hh
M source/blender/blenlib/BLI_winstuff.h
M source/blender/blenlib/intern/listbase.c
M source/blender/blenlib/intern/path_util.c
M source/blender/blenlib/intern/task_scheduler.cc
M source/blender/blenlib/tests/BLI_listbase_test.cc
M source/blender/blenlib/tests/BLI_vector_test.cc
M source/blender/blenloader/intern/versioning_300.c
M source/blender/blenloader/intern/writefile.c
M source/blender/compositor/intern/COM_MemoryProxy.cc
M source/blender/compositor/intern/COM_compositor.cc
M source/blender/editors/animation/drivers.c
M source/blender/editors/animation/keyframes_general.c
M source/blender/editors/asset/intern/asset_indexer.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/gpencil/gpencil_paint.c
M source/blender/editors/include/ED_keyframes_edit.h
M source/blender/editors/include/ED_render.h
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_ops.c
M source/blender/editors/interface/interface_view.cc
M source/blender/editors/object/object_edit.c
M source/blender/editors/render/render_preview.c
M source/blender/editors/screen/screendump.c
M source/blender/editors/sculpt_paint/sculpt.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_info/info_ops.c
M source/blender/editors/space_node/CMakeLists.txt
M source/blender/editors/space_node/drawnode.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/space_node.cc
M source/blender/editors/space_outliner/outliner_dragdrop.c
M source/blender/editors/space_outliner/outliner_edit.c
M source/blender/editors/space_sequencer/sequencer_add.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_convert.c
M source/blender/editors/transform/transform_convert.h
M source/blender/editors/transform/transform_convert_sequencer_image.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_snap.c
M source/blender/editors/undo/ed_undo.c
M source/blender/editors/util/ed_util.c
M source/blender/functions/FN_generic_virtual_array.hh
M source/blender/geometry/intern/realize_instances.cc
M source/blender/gpu/GPU_state.h
M source/blender/gpu/intern/gpu_shader_interface.cc
M source/blender/gpu/opengl/gl_state.hh
M source/blender/imbuf/IMB_imbuf.h
M source/blender/imbuf/intern/transform.cc
M source/blender/makesdna/DNA_mesh_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/DNA_movieclip_types.h
M source/blender/makesdna/DNA_nla_types.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/DNA_object_force_types.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/DNA_particle_types.h
M source/blender/makesdna/DNA_pointcloud_types.h
M source/blender/makesdna/DNA_rigidbody_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_screen_types.h
M source/blender/makesdna/DNA_sequence_types.h
M source/blender/makesdna/DNA_shader_fx_types.h
M source/blender/makesdna/DNA_simulation_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_texture_types.h
M source/blender/makesdna/DNA_tracking_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesdna/DNA_view2d_types.h
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/makesdna/DNA_volume_types.h
M source/blender/makesdna/DNA_windowmanager_types.h
M source/blender/makesdna/DNA_workspace_types.h
M source/blender/makesdna/intern/dna_utils.h
M source/blender/makesrna/intern/rna_access_compare_override.c
M source/blender/makesrna/intern/rna_fcurve.c
M source/blender/makesrna/intern/rna_main.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
D source/blender/modifiers/intern/MOD_weld.c
M source/blender/nodes/CMakeLists.txt
M source/blender/nodes/NOD_geometry.h
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
M source/blender/nodes/composite/node_composite_util.cc
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_composite.cc
M source/blender/nodes/composite/nodes/node_composite_crop.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_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_compare.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_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_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_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_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_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_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_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_dual_mesh.cc
M source/blender/nodes/geometry/nodes/node_geo_image_texture.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_grid.cc
M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
M source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.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_separate_geometry.cc
M source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc
M source/blender/nodes/geometry/nodes/node_geo_set_material.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_viewer.cc
M source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
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/shader/node_shader_tree.c
M source/blender/nodes/shader/node_shader_util.cc
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_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/node_texture_tree.c
M source/blender/nodes/texture/node_texture_util.c
M source/blender/nodes/texture/node_texture_util.h
M source/blender/nodes/texture/nodes/node_texture_output.c
M source/blender/nodes/texture/nodes/node_texture_viewer.c
M source/blender/python/intern/bpy_rna_anim.c
M source/blender/render/intern/pipeline.c
M source/blender/sequencer/intern/sequencer.c
M source/blender/sequencer/intern/strip_add.c
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_files_link.c
M source/blender/windowmanager/intern/wm_surface.c
M source/blender/windowmanager/intern/wm_window.c
M source/blender/windowmanager/xr/intern/wm_xr_session.c
M source/creator/creator.c
M source/creator/creator_args.c
M source/tools
M tests/python/CMakeLists.txt
===================================================================
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 24294df14ed..2936ab1ed8e 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -2083,9 +2083,9 @@ compile_OIIO() {
cmake_d="$cmake_d -D OPENEXR_VERSION=$OPENEXR_VERSION"
if [ "$_with_built_openexr" = true ]; then
- cmake_d="$cmake_d -D ILMBASE_HOME=$INST/openexr"
- cmake_d="$cmake_d -D OPENEXR_HOME=$INST/openexr"
- INFO "ILMBASE_HOME=$INST/openexr"
+ cmake_d="$cmake_d -D ILMBASE_ROOT=$INST/openexr"
+ cmake_d="$cmake_d -D OPENEXR_ROOT=$INST/openexr"
+ INFO "Ilmbase_ROOT=$INST/openexr"
fi
# ptex is only needed when nicholas bishop is ready
@@ -2374,9 +2374,9 @@ compile_OSL() {
#~ cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION"
if [ "$_with_built_openexr" = true ]; then
- INFO "ILMBASE_HOME=$INST/openexr"
- cmake_d="$cmake_d -D OPENEXR_ROOT_DIR=$INST/openexr"
- cmake_d="$cmake_d -D ILMBASE_ROOT_DIR=$INST/openexr"
+ cmake_d="$cmake_d -D ILMBASE_ROOT=$INST/openexr"
+ cmake_d="$cmake_d -D OPENEXR_ROOT=$INST/openexr"
+ INFO "Ilmbase_ROOT=$INST/openexr"
# XXX Temp workaround... sigh, ILMBase really messed the things up by defining their custom names ON by default :(
fi
diff --git a/build_files/build_environment/patches/usd.diff b/build_files/build_environment/patches/usd.diff
index dc4982ad114..8ea1e2054c1 100644
--- a/build_files/build_environment/patches/usd.diff
+++ b/build_files/build_environment/patches/usd.diff
@@ -197,3 +197,38 @@ index 67ec0d15f..6dc3e85a0 100644
#else
#error Unknown architecture.
#endif
+
+diff --git a/pxr/base/arch/demangle.cpp b/pxr/base/arch/demangle.cpp
+index 67ec0d15f..6dc3e85a0 100644
+--- a/pxr/base/arch/demangle.cpp
++++ b/pxr/base/arch/demangle.cpp
+@@ -36,6 +36,7 @@
+ #if (ARCH_COMPILER_GCC_MAJOR == 3 && ARCH_COMPILER_GCC_MINOR >= 1) || \
+ ARCH_COMPILER_GCC_MAJOR > 3 || defined(ARCH_COMPILER_CLANG)
+ #define _AT_LEAST_GCC_THREE_ONE_OR_CLANG
++#include <cxxabi.h>
+ #endif
+
+ PXR_NAMESPACE_OPEN_SCOPE
+@@ -138,7 +139,6 @@
+ #endif
+
+ #if defined(_AT_LEAST_GCC_THREE_ONE_OR_CLANG)
+-#include <cxxabi.h>
+
+ /*
+ * This routine doesn't work when you get to gcc3.4.
+
+diff --git a/pxr/base/work/singularTask.h b/pxr/base/work/singularTask.h
+index 67ec0d15f..6dc3e85a0 100644
+--- a/pxr/base/work/singularTask.h
++++ b/pxr/base/work/singularTask.h
+@@ -120,7 +120,7 @@
+ // case we go again to ensure the task can do whatever it
+ // was awakened to do. Once we successfully take the count
+ // to zero, we stop.
+- size_t old = count;
++ std::size_t old = count;
+ do { _fn(); } while (
+ !count.compare_exchange_strong(old, 0));
+ });
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/ui.py b/intern/cycles/blender/addon/ui.py
index fd86d75a301..e4fbc898070 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1020,7 +1020,7 @@ class CYCLES_OBJECT_PT_motion_blur(CyclesButtonsPanel, Panel):
def poll(cls, context):
ob = context.object
if CyclesButtonsPanel.poll(context) and ob:
- if ob.type in {'MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META', 'CAMERA'}:
+ if ob.type in {'MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META', 'CAMERA', 'HAIR', 'POINTCLOUD'}:
return True
if ob.instance_type == 'COLLECTION' and ob.instance_collection:
return True
diff --git a/intern/cycles/blender/geometry.cpp b/intern/cycles/blender/geometry.cpp
index a5f36a3a17d..78c803b7adb 100644
--- a/intern/cycles/blender/geometry.cpp
+++ b/intern/cycles/blender/geometry.cpp
@@ -19,6 +19,7 @@
#include "scene/hair.h"
#include "scene/mesh.h"
#include "scene/object.h"
+#include "scene/pointcloud.h"
#include "scene/volume.h"
#include "blender/sync.h"
@@ -39,6 +40,10 @@ static Geometry::Type determine_geom_type(BObjectInfo &b_ob_info, bool use_parti
return Geometry::HAIR;
}
+ if (b_ob_info.object_data.is_a(&RNA_PointCloud)) {
+ return Geometry::POINTCLOUD;
+ }
+
if (b_ob_info.object_data.is_a(&RNA_Volume) ||
(b_ob_info.object_data == b_ob_info.real_object.data() &&
object_fluid_gas_domain_find(b_ob_info.real_object))) {
@@ -111,6 +116,9 @@ Geometry *BlenderSync::sync_geometry(BL::Depsgraph &b_depsgraph,
else if (geom_type == Geometry::VOLUME) {
geom = scene->create_node<Volume>();
}
+ else if (geom_type == Geometry::POINTCLOUD) {
+ geom = scene->create_node<PointCloud>();
+ }
else {
geom = scene->create_node<Mesh>();
}
@@ -170,6 +178,10 @@ Geometry *BlenderSync::sync_geometry(BL::Depsgraph &b_depsgraph,
Volume *volume = static_cast<Volume *>(geom);
sync_volume(b_ob_info, volume);
}
+ else if (geom_type == Geometry::POINTCLOUD) {
+ PointCloud *pointcloud = static_cast<PointCloud *>(geom);
+ sync_pointcloud(pointcloud, b_ob_info);
+ }
else {
Mesh *mesh = static_cast<Mesh *>(geom);
sync_mesh(b_depsgraph, b_ob_info, mesh);
@@ -231,6 +243,10 @@ void BlenderSync::sync_geometry_motion(BL::Depsgraph &b_depsgraph,
object_fluid_gas_domain_find(b_ob_info.real_object)) {
/* No volume motion blur support yet. */
}
+ else if (b_ob_info.object_data.is_a(&RNA_PointCloud)) {
+ PointCloud *pointcloud = static_cast<PointCloud *>(geom);
+ sync_pointcloud_motion(pointcloud, b_ob_info, motion_step);
+ }
else {
Mesh *mesh = static_cast<Mesh *>(geom);
sync_mesh_motion(b_depsgraph, b_ob_info, mesh, motion_step);
diff --git a/intern/cycles/blender/object.cpp b/intern/cycles/blender/object.cpp
index d6c52f7faf9..86314d3b196 100644
--- a/intern/cycles/blender/object.cpp
+++ b/intern/cycles/blender/object.cpp
@@ -72,7 +72,8 @@ bool BlenderSync::object_is_geometry(BObjectInfo &b_ob_info)
BL::Object::type_enum type = b_ob_info.iter_object.type();
- if (type == BL::Object::type_VOLUME || type == BL::Object::type_HAIR) {
+ if (type == BL::Object::type_VOLUME || type == BL::Object::type_HAIR ||
+ type == BL::Object::type_POINTCLOUD) {
/* Will be exported attached to mesh. */
return true;
}
@@ -206,7 +207,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph &b_depsgraph,
return NULL;
}
- /* only interested in object that we can create meshes from */
+ /* only interested in object that we can create geometry from */
if (!object_is_geometry(b_ob_info)) {
return NULL;
}
diff --git a/intern/cycles/blender/session.cpp b/intern/cycles/blender/session.cpp
index b8165186b4f..b6f72707fe0 100644
--- a/intern/cycles/blender/session.cpp
+++ b/intern/cycles/blender/session.cpp
@@ -396,6 +396,13 @@ void BlenderSession::render(BL::Depsgraph &b_depsgraph_)
/* set the current view */
b_engine.active_view_set(b_rview_name.c_str());
+ /* Force update in this case, since the camera transform on each frame changes
+ * in different views. This could be optimized by somehow storing the animated
+ * camera transforms separate from the fixed stereo transform. */
+ if ((scene->need_motion() != Scene::MOTION_NONE) && view_index > 0) {
+ sync->tag_update();
+ }
+
/* update scene */
BL::Object b_camera_override(b_engine.camera_override());
sync->sync_camera(b_render, b_camera_override, width, height, b_rview_name.c_str());
diff --git a/intern/cycles/blender/sync.cpp b/intern/cycles/blender/sync.cpp
index 949b7cb1b3b..56137374d8e 100644
--- a/intern/cycles/blender/sync.cpp
+++ b/intern/cycles/blender/sync.cpp
@@ -95,6 +95,11 @@ void BlenderSync::reset(BL::BlendData &b_data, BL::Scene &b_scene)
this->b_scene = b_scene;
}
+void BlenderSync::tag_update()
+{
+ has_updates_ = true;
+}
+
/* Sync */
void BlenderSync::sync_recalc(BL::Depsgraph &b_depsgraph, BL::SpaceView3D &b_v3d)
diff --git a/intern/cycles/blender/sync.h b/intern/cycles/blender/sync.h
index 98197564bec..d074f90bb1b 100644
--- a/intern/cycles/blender/sync.h
+++ b/intern/cycles/blender/sync.h
@@ -66,6 +66,8 @@ class BlenderSync {
void reset(BL::BlendData &b_data, BL::Scene &b_scene);
+ void tag_update();
+
/* sync */
void sync_recalc(BL::Depsgraph &b_depsgraph, BL::SpaceView3D &b_v3d);
void sync_data(BL::RenderSettings &b_render,
@@ -167,12 +169,16 @@ class BlenderSync {
Hair *hair, BL::Mesh &b_mesh, BObjectInfo &b_ob_info, bool motion, int motion_step = 0);
bool object_has_particle_hair(BL::Object b_ob);
+ /* Point Cloud */
+ void sync_pointcloud(PointCloud *pointcloud, BObjectInfo &b_ob_info);
+ void sync_pointcloud_motion(PointCloud *pointcloud, BObjectInfo &b_ob_info, int motion_step = 0);
+
/* Camera */
void sync_camera_motion(
BL::RenderSettings &b_render, BL::Object &b_ob, int width, int height, float motion_time);
/* Geometry */
- Geometry *sync_geometry(BL::Depsgraph &b_depsgrpah,
+ Geometry *sync_geometry(BL::Depsgraph &b_depsgraph,
BObjectInfo &b_ob_info,
bool object_updated,
bool use_particle_hair,
@@ -267,7 +273,6 @@ class BlenderSync {
Progress &progress;
- protected:
/* Indicates that `sync_recalc()` detected changes in the scene.
* If this flag is false then the data is considered to be up-to-date and will not be
* synchronized at all. */
diff --git a/intern/cycles/bvh/build.cpp b/intern/cycles/bvh/build.cpp
index 3ce268dfb25..242595bee4c 100644
--- a/intern/cycles/bvh/build.cpp
+++ b/intern/cycles/bvh/build.cpp
@@ -26,6 +26,7 @@
#include "scene/hair.h"
#include "scene/mesh.h"
#in
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list