[Bf-blender-cvs] [9cfc7967ddf] master: Cycles: use SPDX license headers

Brecht Van Lommel noreply at git.blender.org
Fri Feb 11 17:48:55 CET 2022 

Commit: 9cfc7967ddf0368e9a9a3e22446ef341e472a2a1
Author: Brecht Van Lommel
Date:   Fri Feb 11 13:53:21 2022 +0100
Branches: master
https://developer.blender.org/rB9cfc7967ddf0368e9a9a3e22446ef341e472a2a1

Cycles: use SPDX license headers

* Replace license text in headers with SPDX identifiers.
* Remove specific license info from outdated readme.txt, instead leave details
  to the source files.
* Add list of SPDX license identifiers used, and corresponding license texts.
* Update copyright dates while we're at it.

Ref D14069, T95597

===================================================================

M	intern/cycles/CMakeLists.txt
M	intern/cycles/app/CMakeLists.txt
M	intern/cycles/app/cycles_cubin_cc.cpp
M	intern/cycles/app/cycles_server.cpp
M	intern/cycles/app/cycles_standalone.cpp
M	intern/cycles/app/cycles_xml.cpp
M	intern/cycles/app/cycles_xml.h
M	intern/cycles/app/io_export_cycles_xml.py
M	intern/cycles/app/oiio_output_driver.cpp
M	intern/cycles/app/oiio_output_driver.h
M	intern/cycles/blender/CCL_api.h
M	intern/cycles/blender/CMakeLists.txt
M	intern/cycles/blender/addon/__init__.py
M	intern/cycles/blender/addon/camera.py
M	intern/cycles/blender/addon/engine.py
M	intern/cycles/blender/addon/operators.py
M	intern/cycles/blender/addon/osl.py
M	intern/cycles/blender/addon/presets.py
M	intern/cycles/blender/addon/properties.py
M	intern/cycles/blender/addon/ui.py
M	intern/cycles/blender/addon/version_update.py
M	intern/cycles/blender/camera.cpp
M	intern/cycles/blender/curves.cpp
M	intern/cycles/blender/device.cpp
M	intern/cycles/blender/device.h
M	intern/cycles/blender/display_driver.cpp
M	intern/cycles/blender/display_driver.h
M	intern/cycles/blender/geometry.cpp
M	intern/cycles/blender/id_map.h
M	intern/cycles/blender/image.cpp
M	intern/cycles/blender/image.h
M	intern/cycles/blender/light.cpp
M	intern/cycles/blender/logging.cpp
M	intern/cycles/blender/mesh.cpp
M	intern/cycles/blender/object.cpp
M	intern/cycles/blender/object_cull.cpp
M	intern/cycles/blender/object_cull.h
M	intern/cycles/blender/output_driver.cpp
M	intern/cycles/blender/output_driver.h
M	intern/cycles/blender/particles.cpp
M	intern/cycles/blender/pointcloud.cpp
M	intern/cycles/blender/python.cpp
M	intern/cycles/blender/session.cpp
M	intern/cycles/blender/session.h
M	intern/cycles/blender/shader.cpp
M	intern/cycles/blender/sync.cpp
M	intern/cycles/blender/sync.h
M	intern/cycles/blender/texture.cpp
M	intern/cycles/blender/texture.h
M	intern/cycles/blender/util.h
M	intern/cycles/blender/viewport.cpp
M	intern/cycles/blender/viewport.h
M	intern/cycles/blender/volume.cpp
M	intern/cycles/bvh/CMakeLists.txt
M	intern/cycles/bvh/binning.cpp
M	intern/cycles/bvh/binning.h
M	intern/cycles/bvh/build.cpp
M	intern/cycles/bvh/build.h
M	intern/cycles/bvh/bvh.cpp
M	intern/cycles/bvh/bvh.h
M	intern/cycles/bvh/bvh2.cpp
M	intern/cycles/bvh/bvh2.h
M	intern/cycles/bvh/embree.cpp
M	intern/cycles/bvh/embree.h
M	intern/cycles/bvh/metal.h
M	intern/cycles/bvh/metal.mm
M	intern/cycles/bvh/multi.cpp
M	intern/cycles/bvh/multi.h
M	intern/cycles/bvh/node.cpp
M	intern/cycles/bvh/node.h
M	intern/cycles/bvh/optix.cpp
M	intern/cycles/bvh/optix.h
M	intern/cycles/bvh/params.h
M	intern/cycles/bvh/sort.cpp
M	intern/cycles/bvh/sort.h
M	intern/cycles/bvh/split.cpp
M	intern/cycles/bvh/split.h
M	intern/cycles/bvh/unaligned.cpp
M	intern/cycles/bvh/unaligned.h
M	intern/cycles/cmake/external_libs.cmake
M	intern/cycles/cmake/macros.cmake
M	intern/cycles/cmake/msvc_arch_flags.c
M	intern/cycles/device/CMakeLists.txt
M	intern/cycles/device/cpu/device.cpp
M	intern/cycles/device/cpu/device.h
M	intern/cycles/device/cpu/device_impl.cpp
M	intern/cycles/device/cpu/device_impl.h
M	intern/cycles/device/cpu/kernel.cpp
M	intern/cycles/device/cpu/kernel.h
M	intern/cycles/device/cpu/kernel_function.h
M	intern/cycles/device/cpu/kernel_thread_globals.cpp
M	intern/cycles/device/cpu/kernel_thread_globals.h
M	intern/cycles/device/cuda/device.cpp
M	intern/cycles/device/cuda/device.h
M	intern/cycles/device/cuda/device_impl.cpp
M	intern/cycles/device/cuda/device_impl.h
M	intern/cycles/device/cuda/graphics_interop.cpp
M	intern/cycles/device/cuda/graphics_interop.h
M	intern/cycles/device/cuda/kernel.cpp
M	intern/cycles/device/cuda/kernel.h
M	intern/cycles/device/cuda/queue.cpp
M	intern/cycles/device/cuda/queue.h
M	intern/cycles/device/cuda/util.cpp
M	intern/cycles/device/cuda/util.h
M	intern/cycles/device/denoise.cpp
M	intern/cycles/device/denoise.h
M	intern/cycles/device/device.cpp
M	intern/cycles/device/device.h
M	intern/cycles/device/dummy/device.cpp
M	intern/cycles/device/dummy/device.h
M	intern/cycles/device/graphics_interop.cpp
M	intern/cycles/device/graphics_interop.h
M	intern/cycles/device/hip/device.cpp
M	intern/cycles/device/hip/device.h
M	intern/cycles/device/hip/device_impl.cpp
M	intern/cycles/device/hip/device_impl.h
M	intern/cycles/device/hip/graphics_interop.cpp
M	intern/cycles/device/hip/graphics_interop.h
M	intern/cycles/device/hip/kernel.cpp
M	intern/cycles/device/hip/kernel.h
M	intern/cycles/device/hip/queue.cpp
M	intern/cycles/device/hip/queue.h
M	intern/cycles/device/hip/util.cpp
M	intern/cycles/device/hip/util.h
M	intern/cycles/device/kernel.cpp
M	intern/cycles/device/kernel.h
M	intern/cycles/device/memory.cpp
M	intern/cycles/device/memory.h
M	intern/cycles/device/metal/bvh.h
M	intern/cycles/device/metal/bvh.mm
M	intern/cycles/device/metal/device.h
M	intern/cycles/device/metal/device.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/device/metal/queue.h
M	intern/cycles/device/metal/queue.mm
M	intern/cycles/device/metal/util.h
M	intern/cycles/device/metal/util.mm
M	intern/cycles/device/multi/device.cpp
M	intern/cycles/device/multi/device.h
M	intern/cycles/device/optix/device.cpp
M	intern/cycles/device/optix/device.h
M	intern/cycles/device/optix/device_impl.cpp
M	intern/cycles/device/optix/device_impl.h
M	intern/cycles/device/optix/queue.cpp
M	intern/cycles/device/optix/queue.h
M	intern/cycles/device/optix/util.h
M	intern/cycles/device/queue.cpp
M	intern/cycles/device/queue.h
M	intern/cycles/doc/CMakeLists.txt
R100	intern/cycles/doc/license/Apache_2.0.txt	intern/cycles/doc/license/Apache2-license.txt
A	intern/cycles/doc/license/BSD-3-Clause-license.txt
D	intern/cycles/doc/license/Boost.txt
M	intern/cycles/doc/license/CMakeLists.txt
D	intern/cycles/doc/license/ILM.txt
R061	intern/cycles/doc/license/NVidia.txt	intern/cycles/doc/license/MIT-license.txt
D	intern/cycles/doc/license/OSL.txt
A	intern/cycles/doc/license/SPDX-license-identifiers.txt
D	intern/cycles/doc/license/Sobol.txt
M	intern/cycles/doc/license/readme.txt
M	intern/cycles/graph/CMakeLists.txt
M	intern/cycles/graph/node.cpp
M	intern/cycles/graph/node.h
M	intern/cycles/graph/node_enum.h
M	intern/cycles/graph/node_type.cpp
M	intern/cycles/graph/node_type.h
M	intern/cycles/graph/node_xml.cpp
M	intern/cycles/graph/node_xml.h
M	intern/cycles/integrator/CMakeLists.txt
M	intern/cycles/integrator/adaptive_sampling.cpp
M	intern/cycles/integrator/adaptive_sampling.h
M	intern/cycles/integrator/denoiser.cpp
M	intern/cycles/integrator/denoiser.h
M	intern/cycles/integrator/denoiser_device.cpp
M	intern/cycles/integrator/denoiser_device.h
M	intern/cycles/integrator/denoiser_oidn.cpp
M	intern/cycles/integrator/denoiser_oidn.h
M	intern/cycles/integrator/denoiser_optix.cpp
M	intern/cycles/integrator/denoiser_optix.h
M	intern/cycles/integrator/pass_accessor.cpp
M	intern/cycles/integrator/pass_accessor.h
M	intern/cycles/integrator/pass_accessor_cpu.cpp
M	intern/cycles/integrator/pass_accessor_cpu.h
M	intern/cycles/integrator/pass_accessor_gpu.cpp
M	intern/cycles/integrator/pass_accessor_gpu.h
M	intern/cycles/integrator/path_trace.cpp
M	intern/cycles/integrator/path_trace.h
M	intern/cycles/integrator/path_trace_display.cpp
M	intern/cycles/integrator/path_trace_display.h
M	intern/cycles/integrator/path_trace_tile.cpp
M	intern/cycles/integrator/path_trace_tile.h
M	intern/cycles/integrator/path_trace_work.cpp
M	intern/cycles/integrator/path_trace_work.h
M	intern/cycles/integrator/path_trace_work_cpu.cpp
M	intern/cycles/integrator/path_trace_work_cpu.h
M	intern/cycles/integrator/path_trace_work_gpu.cpp
M	intern/cycles/integrator/path_trace_work_gpu.h
M	intern/cycles/integrator/render_scheduler.cpp
M	intern/cycles/integrator/render_scheduler.h
M	intern/cycles/integrator/shader_eval.cpp
M	intern/cycles/integrator/shader_eval.h
M	intern/cycles/integrator/tile.cpp
M	intern/cycles/integrator/tile.h
M	intern/cycles/integrator/work_balancer.cpp
M	intern/cycles/integrator/work_balancer.h
M	intern/cycles/integrator/work_tile_scheduler.cpp
M	intern/cycles/integrator/work_tile_scheduler.h
M	intern/cycles/kernel/CMakeLists.txt
M	intern/cycles/kernel/bake/bake.h
M	intern/cycles/kernel/bvh/bvh.h
M	intern/cycles/kernel/bvh/embree.h
M	intern/cycles/kernel/bvh/local.h
M	intern/cycles/kernel/bvh/metal.h
M	intern/cycles/kernel/bvh/nodes.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/bvh/volume.h
M	intern/cycles/kernel/bvh/volume_all.h
M	intern/cycles/kernel/camera/camera.h
M	intern/cycles/kernel/camera/projection.h
M	intern/cycles/kernel/closure/alloc.h
M	intern/cycles/kernel/closure/bsdf.h
M	intern/cycles/kernel/closure/bsdf_ashikhmin_shirley.h
M	intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
M	intern/cycles/kernel/closure/bsdf_diffuse.h
M	intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
M	intern/cycles/kernel/closure/bsdf_hair.h
M	intern/cycles/kernel/closure/bsdf_hair_principled.h
M	intern/cycles/kernel/closure/bsdf_microfacet.h
M	intern/cycles/kernel/closure/bsdf_microfacet_multi.h
M	intern/cycles/kernel/closure/bsdf_microfacet_multi_impl.h
M	intern/cycles/kernel/closure/bsdf_oren_nayar.h
M	intern/cycles/kernel/closure/bsdf_phong_ramp.h
M	intern/cycles/kernel/closure/bsdf_principled_diffuse.h
M	intern/cycles/kernel/closure/bsdf_principled_sheen.h
M	intern/cycles/kernel/closure/bsdf_reflection.h
M	intern/cycles/kernel/closure/bsdf_refraction.h
M	intern/cycles/kernel/closure/bsdf_toon.h
M	intern/cycles/kernel/closure/bsdf_transparent.h
M	intern/cycles/kernel/closure/bsdf_util.h
M	intern/cycles/kernel/closure/bssrdf.h
M	intern/cycles/kernel/closure/emissive.h
M	intern/cycles/kernel/closure/volume.h
M	intern/cycles/kernel/device/cpu/compat.h
M	intern/cycles/kernel/device/cpu/globals.h
M	intern/cycles/kernel/device/cpu/image.h
M	intern/cycles/kernel/device/cpu/kernel.cpp
M	intern/cycles/kernel/device/cpu/kernel.h
M	intern/cycles/kernel/device/cpu/kernel_arch.h
M	intern/cycles/kernel/device/cpu/kernel_arch_impl.h
M	intern/cycles/kernel/device/cpu/kernel_avx.cpp
M	intern/cycles/kernel/device/cpu/kernel_avx2.cpp
M	intern/cycles/kernel/device/cpu/kernel_sse2.cpp
M	intern/cycles/kernel/device/cpu/kernel_sse3.cpp
M	intern/cycles/kernel/device/cpu/kernel_sse41.cpp
M	intern/cycles/kernel/device/cuda/compat.h
M	intern/cycles/kernel/device/cuda/config.h
M	intern/cycles/kernel/device/cuda/globals.h
M	intern/cycles/kernel/device/cuda/kernel.cu
M	intern/cycles/kernel/device/gpu/image.h
M	intern/cycles/kernel/device/gpu/kernel.h
M	intern/cycles/kernel/device/gpu/parallel_active_index.h
M	intern/cycles/kernel/device/gpu/parallel_prefix_sum.h
M	intern/cycles/kernel/device/gpu/parallel_reduce.h
M	intern/cycles/kernel/device/gpu/parallel_sorted_index.h
M	intern/cycles/kernel/device/gpu/work_stealing.h
M	intern/cycles/kernel/device/hip/compat.h
M	intern/cycles/kernel/device/hip/config.h
M	intern/cycles/kernel/device/hip/globals.h
M	intern/cycles/kernel/device/hip/kernel.cpp
M	intern/cycles/kernel/device/metal/compat.h
M	intern/cycles/kernel/device/metal/context_begin.h
M	intern/cycles/kernel/device/metal/context_end.h
M	intern/cycles/kernel/device/metal/globals.h
M	intern/cycles/kernel/device/metal/kernel.metal
M	intern/cycles/kernel/device/optix/compat.h
M	intern/cycles/kernel/device/optix/globals.h
M	intern/cycles/kernel/device/optix/kernel.cu
M	intern/cycles/kernel/device/optix/kernel_shader_raytrace.cu
M	intern/cycles/kernel/film/accumulate.h
M	intern/cycles/kernel/film/adaptive_sampling.h
M	intern/cycles/kernel/film/id_passes.h
M	intern/cycles/kernel/film/passes.h
M	intern/cycles/kernel/film/read.h
M	intern/cycles/kernel/film/write_passes.h
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/motion_curve.h
M	intern/cycles/kernel/geom/motion_point.h
M	intern/cycles/kernel/geom/motion_triangle.h
M	intern/cycles/kernel/geom/motion_triangle_intersect.h
M	intern/cycles/kernel/geom/motion_triangle_shader.h
M	intern/cycles/kernel/geom/object.h
M	intern/cycles/kernel/geom/point.h
M	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/geom/subd_triangle.h
M	intern/cycles/kernel/geom/triangle.h
M	intern/cycles/kernel/geom/triangle_intersect.h
M	intern/cycles/kernel/geom/volume.h
M	intern/cycles/kernel/integrator/init_from_bake.h
M	intern/cycles/kernel/integrator/init_from_camera.h
M	intern/cycles/kernel/integrator/intersect_closest.h
M	intern/cycles/kernel/integrator/intersect_shadow.h
M	intern/cycles/kernel/integrator/intersect_subsurface.h
M	intern/cycles/kernel/integrator/intersect_volume_stack.h
M	intern/cycles/kernel/integrator/megakernel.h
M	intern/cycles/kernel/integrator/path_state.h
M	intern/cycles/kernel/integrator/shade_background.h
M	intern/cycles/kernel/integrator/shade_light.h
M	intern/cycles/kernel/integrator/shade_shadow.h
M	intern/cycles/kernel/integrator/shade_surface.h
M	intern/cycles/kernel/integrator/shade_volume.h
M	intern/cycles/kernel/integrator/shader_eval.h
M	intern/cycles/kernel/integrator/shadow_catcher.h
M	intern/cycles/kernel/integrator/shadow_state_template.h
M	intern/cycles/kernel/integrator/state.h
M	intern/cycles/kernel/integrator/state_flow.h
M	intern/cycles/kernel/integrator/state_template.h
M	intern/cycles/kernel/integrator/state_util.h
M	intern/cycles/kernel/integrator/subsurface.h
M	intern/cycles/kernel/integrator/subsurface_disk.h
M	intern/cycles/kernel/integrator/subsurface_random_walk.h
M	intern/cycles/kernel/integrator/volume_stack.h
M	intern/cycles/kernel/light/background.h
M	intern/cycles/kernel/light/common.h
M	intern/cycles/kernel/light/light.h
M	intern/cycles/kernel/light/sample.h
M	intern/cycles/kernel/osl/CMakeLists.txt
M	intern/cycles/kernel/osl/background.cpp
M	intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
M	intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
M	intern/cycles/kernel/osl/bssrdf.cpp
M	intern/cycles/kernel/osl/closures.cpp
M	intern/cycles/kernel/osl/closures.h
M	intern/cycles/kernel/osl/emissive.cpp
M	intern/cycles/kernel/osl/globals.h
M	intern/cycles/kernel/osl/services.cpp
M	intern/cycles/kernel/osl/services.h
M	intern/cycles/kernel/osl/shader.cpp
M	intern/cycles/kernel/osl/shader.h
M	intern/cycles/kernel/osl/shaders/CMakeLists.txt
M	intern/cycles/kernel/osl/shaders/node_absorption_volume.osl
M	intern/cycles/kernel/osl/shaders/node_add_closure.osl
M	intern/cycles/kernel/osl/shaders/node_ambient_occlusion.osl
M	intern/cycles/kernel/osl/shaders/node_anisotropic_bsdf.osl
M	intern/cycles/kernel/osl/shaders/node_attribute.osl
M	intern/cycles/kernel/osl/shaders/node_background.osl
M	intern/cycles/kernel/osl/shaders/node_bevel.osl
M	intern/cycles/kernel/osl/shaders/node_blackbody.osl
M	intern/cycles/kernel/osl/shaders/node_brick_texture.osl
M	intern/cycles/kernel/osl/shaders/node_brightness.osl
M	intern/cycles/kernel/osl/shaders/node_bump.osl
M	intern/cycles/kernel/osl/shaders/node_camera.osl
M	intern/cycles/kernel/osl/shaders/node_checker_texture.osl
M	intern/cycles/kernel/osl/shaders/node_clamp.osl
M	intern/cycles/kernel/osl/shaders/node_color.h
M	intern/cycles/kernel/osl/shaders/node_combine_hsv.osl
M	intern/cycles/kernel/osl/shaders/node_combine_rgb.osl
M	intern/cycles/kernel/osl/shaders/node_combine_xyz.osl
M	intern/cycles/kernel/osl/shaders/node_convert_from_color.osl
M	intern/cycles/kernel/osl/shaders/node_convert_from_float.osl
M	intern/cycles/kernel/osl/shaders/node_convert_from_int.osl
M	intern/cycles/kernel/osl/shaders/node_convert_from_normal.osl
M	intern/cycles/kernel/osl/shaders/node_convert_from_point.osl
M	intern/cycles/kernel/osl/shaders/node_convert_from_string.osl
M	intern/cycles/kernel/osl/shaders/node_convert_from_vector.osl
M	intern/cycles/kernel/osl/shaders/node_diffuse_bsdf.osl
M	intern/cycles/kernel/osl/shaders/node_displacement.osl
M	intern/cycles/kernel/osl/shaders/node_emission.osl
M	intern/cycles/kernel/osl/shaders/node_environment_texture.osl
M	intern/cycles/kernel/osl/shaders/node_float_curve.osl
M	intern/cycles/kernel/osl/shaders/node_fresnel.h
M	intern/cycles/kernel/osl/shaders/node_fresnel.osl
M	intern/cycles/kernel/osl/shaders/node_gamma.osl
M	intern/cycles/kernel/osl/shaders/node_geometry.osl
M	intern/cycles/kernel/osl/shaders/node_glass_bsdf.osl
M	intern/cycles/kernel/osl/shaders/node_glossy_bsdf.osl
M	intern/cycles/kernel/osl/shaders/node_gradient_texture.osl
M	intern/cycles/kernel/osl/shaders/node_hair_bsdf.osl
M	intern/cycles/kernel/osl/shaders/node_hair_info.osl
M	intern/cycles/kernel/osl/shaders/node_hash.h
M	intern/cycles/kernel/osl/shaders/node_holdout.osl
M	intern/cycles/kernel/osl/shaders/node_hsv.osl
M	intern/cycles/kernel/osl/shaders/node_ies_light.osl
M	intern/cycles/kernel/osl/shaders/node_image_texture.osl
M	intern/cycles/kernel/osl/shaders/node_invert.osl
M	intern/cycles/kernel/osl/shaders/node_layer_weight.osl
M	intern/cycles/kernel/osl/shaders/node_light_falloff.osl
M	intern/cycles/kernel/osl/shaders/node_light_path.osl
M	intern/cycles/kernel/osl/shaders/node_magic_texture.osl
M	intern/cycles/kernel/osl/shaders/node_map_range.osl
M	intern/cycles/kernel/osl/shaders/node_mapping.osl
M	intern/cycles/kernel/osl/shaders/node_math.h
M	intern/cycles/kernel/osl/shaders/node_math.osl
M	intern/cycles/kernel/osl/shaders/node_mix.osl
M	intern/cycles/kernel/osl/shaders/node_mix_closure.osl
M	intern/cycles/kernel/osl/shaders/node_musgrave_texture.osl
M	intern/cycles/kernel/osl/shaders/node_noise.h
M	intern/cycles/kernel/osl/shaders/node_noise_texture.osl
M	intern/cycles/kernel/osl/shaders/node_normal.osl
M	intern/cycles/kernel/osl/shaders/node_normal_map.osl
M	intern/cycles/kernel/osl/shaders/node_object_info.osl
M	intern/cycles/kernel/osl/shaders/node_output_displacement.osl
M	intern/cycles/kernel/osl/shaders/node_output_surface.osl
M	intern/cycles/kernel/osl/shaders/node_output_volume.osl
M	intern/cycles/kernel/osl/shaders/node_particle_info.osl
M	intern/cycles/kernel/osl/shaders/node_point_info.osl
M	intern/cycles/kernel/osl/shaders/node_principled_bsdf.osl
M	intern/cycles/kernel/osl/shaders/node_principled_hair_bsdf.osl
M	intern/cycles/kernel/osl/shaders/node_principled_volume.osl
M	intern/cycles/kernel/osl/shaders/node_ramp_util.h
M	intern/cycles/kernel/osl/shaders/node_refraction_bsdf.osl
M	intern/cycles/kernel/osl/shaders/node_rgb_curves.osl
M	intern/cycles/kernel/osl/shaders/node_rgb_ramp.osl
M	intern/cycles/kernel/osl/shaders/node_rgb_to_bw.osl
M	intern/cycles/kernel/osl/shaders/node_scatter_volume.osl
M	intern/cycles/kernel/osl/shaders/node_separate_hsv.osl
M	intern/cycles/kernel/osl/shaders/node_separate_rgb.osl
M	intern/cycles/kernel/osl/shaders/node_separate_xyz.osl
M	intern/cycles/kernel/osl/shaders/node_set_normal.osl
M	intern/cycles/kernel/osl/shaders/node_sky_texture.osl
M	intern/cycles/kernel/osl/shaders/node_subsurface_scattering.osl
M	intern/cycles/kernel/osl/shaders/node_tangent.osl
M	intern/cycles/kernel/osl/shaders/node_texture_coordinate.osl
M	intern/cycles/kernel/osl/shaders/node_toon_bsdf.osl
M	intern/cycles/kernel/osl/shaders/node_translucent_bsdf.osl
M	intern/cycles/kernel/osl/shaders/node_transparent_bsdf.osl
M	intern/cycles/kernel/osl/shaders/node_uv_map.osl
M	intern/cycles/kernel/osl/shaders/node_value.osl
M	intern/cycles/kernel/osl/shaders/node_vector_curves.osl
M	intern/cycles/kernel/osl/shaders/node_vector_displacement.osl
M	intern/cycles/kernel/osl/shaders/node_vector_map_range.osl
M	intern/cycles/kernel/osl/shaders/node_vector_math.osl
M	intern/cycles/kernel/osl/shaders/node_vector_rotate.osl
M	intern/cycles/kernel/osl/shaders/node_vector_transform.osl
M	intern/cycles/kernel/osl/shaders/node_velvet_bsdf.osl
M	intern/cycles/kernel/osl/shaders/node_vertex_color.osl
M	intern/cycles/kernel/osl/shaders/node_voronoi_texture.osl
M	intern/cycles/kernel/osl/shaders/node_voxel_texture.osl
M	intern/cycles/kernel/osl/shaders/node_wave_texture.osl
M	intern/cycles/kernel/osl/shaders/node_wavelength.osl
M	intern/cycles/kernel/osl/shaders/node_white_noise_texture.osl
M	intern/cycles/kernel/osl/shaders/node_wireframe.osl
M	intern/cycles/kernel/osl/shaders/stdcycles.h
M	intern/cycles/kernel/sample/jitter.h
M	intern/cycles/kernel/sample/lcg.h
M	intern/cycles/kernel/sample/mapping.h
M	intern/cycles/kernel/sample/mis.h
M	intern/cycles/kernel/sample/pattern.h
M	intern/cycles/kernel/svm/ao.h
M	intern/cycles/kernel/svm/aov.h
M	intern/cycles/kernel/svm/attribute.h
M	intern/cycles/kernel/svm/bevel.h
M	intern/cycles/kernel/svm/blackbody.h
M	intern/cycles/kernel/svm/brick.h
M	intern/cycles/kernel/svm/brightness.h
M	intern/cycles/kernel/svm/bump.h
M	intern/cycles/kernel/svm/camera.h
M	intern/cycles/kernel/svm/checker.h
M	intern/cycles/kernel/svm/clamp.h
M	intern/cycles/kernel/svm/closure.h
M	intern/cycles/kernel/svm/color_util.h
M	intern/cycles/kernel/svm/convert.h
M	intern/cycles/kernel/svm/displace.h
M	intern/cycles/kernel/svm/fractal_noise.h
M	intern/cycles/kernel/svm/fresnel.h
M	intern/cycles/kernel/svm/gamma.h
M	intern/cycles/kernel/svm/geometry.h
M	intern/cycles/kernel/svm/gradient.h
M	intern/cycles/kernel/svm/hsv.h
M	intern/cycles/kernel/svm/ies.h
M	intern/cycles/kernel/svm/image.h
M	intern/cycles/kernel/svm/invert.h
M	intern/cycles/kernel/svm/light_path.h
M	intern/cycles/kernel/svm/magic.h
M	intern/cycles/kernel/svm/map_range.h
M	intern/cycles/kernel/svm/mapping.h
M	intern/cycles/kernel/svm/mapping_util.h
M	intern/cycles/kernel/svm/math.h
M	intern/cycles/kernel/svm/math_util.h
M	intern/cycles/kernel/svm/mix.h
M	intern/cycles/kernel/svm/musgrave.h
M	intern/cycles/kernel/svm/noise.h
M	intern/cycles/kernel/svm/noisetex.h
M	intern/cycles/kernel/svm/normal.h
M	intern/cycles/kernel/svm/ramp.h
M	intern/cycles/kernel/svm/ramp_util.h
M	intern/cycles/kernel/svm/sepcomb_hsv.h
M	intern/cycles/kernel/svm/sepcomb_vector.h
M	intern/cycles/kernel/svm/sky.h
M	intern/cycles/kernel/svm/svm.h
M	intern/cycles/kernel/svm/tex_coord.h
M	intern/cycles/kernel/svm/types.h
M	intern/cycles/kernel/svm/value.h
M	intern/cycles/kernel/svm/vector_rotate.h
M	intern/cycles/kernel/svm/vector_transform.h
M	intern/cycles/kernel/svm/vertex_color.h
M	intern/cycles/kernel/svm/voronoi.h
M	intern/cycles/kernel/svm/voxel.h
M	intern/cycles/kernel/svm/wave.h
M	intern/cycles/kernel/svm/wavelength.h
M	intern/cycles/kernel/svm/white_noise.h
M	intern/cycles/kernel/svm/wireframe.h
M	intern/cycles/kernel/tables.h
M	intern/cycles/kernel/textures.h
M	intern/cycles/kernel/types.h
M	intern/cycles/kernel/util/color.h
M	intern/cycles/kernel/util/differential.h
M	intern/cycles/kernel/util/lookup_table.h
M	intern/cycles/kernel/util/profiling.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/attribute.cpp
M	intern/cycles/scene/attribute.h
M	intern/cycles/scene/background.cpp
M	intern/cycles/scene/background.h
M	intern/cycles/scene/bake.cpp
M	intern/cycles/scene/bake.h
M	intern/cycles/scene/camera.cpp
M	intern/cycles/scene/camera.h
M	intern/cycles/scene/colorspace.cpp
M	intern/cycles/scene/colorspace.h
M	intern/cycles/scene/constant_fold.cpp
M	intern/cycles/scene/constant_fold.h
M	intern/cycles/scene/curves.cpp
M	intern/cycles/scene/curves.h
M	intern/cycles/scene/film.cpp
M	intern/cycles/scene/film.h
M	intern/cycles/scene/geometry.cpp
M	intern/cycles/scene/geometry.h
M	intern/cycles/scene/hair.cpp
M	intern/cycles/scene/hair.h
M	intern/cycles/scene/image.cpp
M	intern/cycles/scene/image.h
M	intern/cycles/scene/image_oiio.cpp
M	intern/cycles/scene/image_oiio.h
M	intern/cycles/scene/image_sky.cpp
M	intern/cycles/scene/image_sky.h
M	intern/cycles/scene/image_vdb.cpp
M	intern/cycles/scene/image_vdb.h
M	intern/cycles/scene/integrator.cpp
M	intern/cycles/scene/integrator.h
M	intern/cycles/scene/jitter.cpp
M	intern/cycles/scene/jitter.h
M	intern/cycles/scene/light.cpp
M	intern/cycles/scene/light.h
M	intern/cycles/scene/mesh.cpp
M	intern/cycles/scene/mesh.h
M	intern/cycles/scene/mesh_displace.cpp
M	intern/cycles/scene/mesh_subdivision.cpp
M	intern/cycles/scene/object.cpp
M	intern/cycles/scene/object.h
M	intern/cycles/scene/osl.cpp
M	intern/cycles/scene/osl.h
M	intern/cycles/scene/particles.cpp
M	intern/cycles/scene/particles.h
M	intern/cycles/scene/pass.cpp
M	intern/cycles/scene/pass.h
M	intern/cycles/scene/pointcloud.cpp
M	intern/cycles/scene/pointcloud.h
M	intern/cycles/scene/procedural.cpp
M	intern/cycles/scene/procedural.h
M	intern/cycles/scene/scene.cpp
M	intern/cycles/scene/scene.h
M	intern/cycles/scene/shader.cpp
M	intern/cycles/scene/shader.h
M	intern/cycles/scene/shader_graph.cpp
M	intern/cycles/scene/shader_graph.h
M	intern/cycles/scene/shader_nodes.cpp
M	intern/cycles/scene/shader_nodes.h
M	intern/cycles/scene/sobol.cpp
M	intern/cycles/scene/sobol.h
M	intern/cycles/scene/sobol.tables
M	intern/cycles/scene/stats.cpp
M	intern/cycles/scene/stats.h
M	intern/cycles/scene/svm.cpp
M	intern/cycles/scene/svm.h
M	intern/cycles/scene/tables.cpp
M	intern/cycles/scene/tables.h
M	intern/cycles/scene/volume.cpp
M	intern/cycles/scene/volume.h
M	intern/cycles/session/CMakeLists.txt
M	intern/cycles/session/buffers.cpp
M	intern/cycles/session/buffers.h
M	intern/cycles/session/denoising.cpp
M	intern/cycles/session/denoising.h
M	intern/cycles/session/display_driver.h
M	intern/cycles/session/merge.cpp
M	intern/cycles/session/merge.h
M	intern/cycles/session/output_driver.h
M	intern/cycles/session/session.cpp
M	intern/cycles/session/session.h
M	intern/cycles/session/tile.cpp
M	intern/cycles/session/tile.h
M	intern/cycles/subd/CMakeLists.txt
M	intern/cycles/subd/dice.cpp
M	intern/cycles/subd/dice.h
M	intern/cycles/subd/patch.cpp
M	intern/cycles/subd/patch.h
M	intern/cycles/subd/patch_table.h
M	intern/cycles/subd/split.cpp
M	intern/cycles/subd/split.h
M	intern/cycles/subd/subpatch.h
M	intern/cycles/test/CMakeLists.txt
M	intern/cycles/test/integrator_adaptive_sampling_test.cpp
M	intern/cycles/test/integrator_render_scheduler_test.cpp
M	intern/cycles/test/integrator_tile_test.cpp
M	intern/cycles/test/render_graph_finalize_test.cpp
M	intern/cycles/test/util_aligned_malloc_test.cpp
M	intern/cycles/test/util_avxf_avx2_test.cpp
M	intern/cycles/test/util_avxf_avx_test.cpp
M	intern/cycles/test/util_avxf_test.h
M	intern/cycles/test/util_math_test.cpp
M	intern/cycles/test/util_path_test.cpp
M	intern/cycles/test/util_string_test.cpp
M	intern/cycles/test/util_task_test.cpp
M	intern/cycles/test/util_time_test.cpp
M	intern/cycles/test/util_transform_test.cpp
M	intern/cycles/util/CMakeLists.txt
M	intern/cycles/util/algorithm.h
M	intern/cycles/util/aligned_malloc.cpp
M	intern/cycles/util/aligned_malloc.h
M	intern/cycles/util/args.h
M	intern/cycles/util/array.h
M	intern/cycles/util/atomic.h
M	intern/cycles/util/avxb.h
M	intern/cycles/util/avxf.h
M	intern/cycles/util/avxi.h
M	intern/cycles/util/boundbox.h
M	intern/cycles/util/color.h
M	intern/cycles/util/debug.cpp
M	intern/cycles/util/debug.h
M	intern/cycles/util/defines.h
M	intern/cycles/util/deque.h
M	intern/cycles/util/disjoint_set.h
M	intern/cycles/util/foreach.h
M	intern/cycles/util/function.h
M	intern/cycles/util/guarded_allocator.cpp
M	intern/cycles/util/guarded_allocator.h
M	intern/cycles/util/half.h
M	intern/cycles/util/hash.h
M	intern/cycles/util/ies.cpp
M	intern/cycles/util/ies.h
M	intern/cycles/util/image.h
M	intern/cycles/util/image_impl.h
M	intern/cycles/util/list.h
M	intern/cycles/util/log.cpp
M	intern/cycles/util/log.h
M	intern/cycles/util/map.h
M	intern/cycles/util/math.h
M	intern/cycles/util/math_cdf.cpp
M	intern/cycles/util/math_cdf.h
M	intern/cycles/util/math_fast.h
M	intern/cycles/util/math_float2.h
M	intern/cycles/util/math_float3.h
M	intern/cycles/util/math_float4.h
M	intern/cycles/util/math_int2.h
M	intern/cycles/util/math_int3.h
M	intern/cycles/util/math_int4.h
M	intern/cycles/util/math_intersect.h
M	intern/cycles/util/math_matrix.h
M	intern/cycles/util/md5.cpp
M	intern/cycles/util/md5.h
M	intern/cycles/util/murmurhash.cpp
M	intern/cycles/util/murmurhash.h
M	intern/cycles/util/opengl.h
M	intern/cycles/util/openimagedenoise.h
M	intern/cycles/util/openvdb.h
M	intern/cycles/util/optimization.h
M	intern/cycles/util/param.h
M	intern/cycles/util/path.cpp
M	intern/cycles/util/path.h
M	intern/cycles/util/profiling.cpp
M	intern/cycles/util/profiling.h
M	intern/cycles/util/progress.h
M	intern/cycles/util/projection.h
M	intern/cycles/util/queue.h
M	intern/cycles/util/rect.h
M	intern/cycles/util/semaphore.h
M	intern/cycles/util/set.h
M	intern/cycles/util/simd.cpp
M	intern/cycles/util/simd.h
M	intern/cycles/util/sseb.h
M	intern/cycles/util/ssef.h
M	intern/cycles/util/ssei.h
M	intern/cycles/util/stack_allocator.h
M	intern/cycles/util/static_assert.h
M	intern/cycles/util/stats.h
M	intern/cycles/util/string.cpp
M	intern/cycles/util/string.h
M	intern/cycles/util/system.cpp
M	intern/cycles/util/system.h
M	intern/cycles/util/task.cpp
M	intern/cycles/util/task.h
M	intern/cycles/util/tbb.h
M	intern/cycles/util/texture.h
M	intern/cycles/util/thread.cpp
M	intern/cycles/util/thread.h
M	intern/cycles/util/time.cpp
M	intern/cycles/util/time.h
M	intern/cycles/util/transform.cpp
M	intern/cycles/util/transform.h
M	intern/cycles/util/types.h
M	intern/cycles/util/types_float2.h
M	intern/cycles/util/types_float2_impl.h
M	intern/cycles/util/types_float3.h
M	intern/cycles/util/types_float3_impl.h
M	intern/cycles/util/types_float4.h
M	intern/cycles/util/types_float4_impl.h
M	intern/cycles/util/types_float8.h
M	intern/cycles/util/types_float8_impl.h
M	intern/cycles/util/types_int2.h
M	intern/cycles/util/types_int2_impl.h
M	intern/cycles/util/types_int3.h
M	intern/cycles/util/types_int3_impl.h
M	intern/cycles/util/types_int4.h
M	intern/cycles/util/types_int4_impl.h
M	intern/cycles/util/types_uchar2.h
M	intern/cycles/util/types_uchar2_impl.h
M	intern/cycles/util/types_uchar3.h
M	intern/cycles/util/types_uchar3_impl.h
M	intern/cycles/util/types_uchar4.h
M	intern/cycles/util/types_uchar4_impl.h
M	intern/cycles/util/types_uint2.h
M	intern/cycles/util/types_uint2_impl.h
M	intern/cycles/util/types_uint3.h
M	intern/cycles/util/types_uint3_impl.h
M	intern/cycles/util/types_uint4.h
M	intern/cycles/util/types_uint4_impl.h
M	intern/cycles/util/types_ushort4.h
M	intern/cycles/util/types_vector3.h
M	intern/cycles/util/types_vector3_impl.h
M	intern/cycles/util/unique_ptr.h
M	intern/cycles/util/vector.h
M	intern/cycles/util/version.h
M	intern/cycles/util/view.cpp
M	intern/cycles/util/view.h
M	intern/cycles/util/windows.cpp
M	intern/cycles/util/windows.h
M	intern/cycles/util/xml.h

===================================================================

diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index 6fe0773b360..ad2b5ab4d7b 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2011-2020 Blender Foundation
+# Copyright 2011-2022 Blender Foundation
 
 # Standalone or with Blender
 if(NOT WITH_BLENDER AND WITH_CYCLES_STANDALONE)
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index ad2df29bc11..75ff7114dd7 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2011-2020 Blender Foundation
+# Copyright 2011-2022 Blender Foundation
 
 #####################################################################
 # Cycles standalone executable
diff --git a/intern/cycles/app/cycles_cubin_cc.cpp b/intern/cycles/app/cycles_cubin_cc.cpp
index e5d256dd113..3b57dd83a5c 100644
--- a/intern/cycles/app/cycles_cubin_cc.cpp
+++ b/intern/cycles/app/cycles_cubin_cc.cpp
@@ -1,18 +1,5 @@
-/*
- * Copyright 2017 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright 2017-2022 Blender Foundation */
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/intern/cycles/app/cycles_server.cpp b/intern/cycles/app/cycles_server.cpp
index 38771b8aed8..f12a0875298 100644
--- a/intern/cycles/app/cycles_server.cpp
+++ b/intern/cycles/app/cycles_server.cpp
@@ -1,18 +1,5 @@
-/*
- * Copyright 2011-2013 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright 2011-2022 Blender Foundation */
 
 #include <stdio.h>
 
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp
index 7123edbef64..0e425ac3d8f 100644
--- a/intern/cycles/app/cycles_standalone.cpp
+++ b/intern/cycles/app/cycles_standalone.cpp
@@ -1,18 +1,5 @@
-/*
- * Copyright 2011-2013 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright 2011-2022 Blender Foundation */
 
 #include <stdio.h>
 
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 6144d2c60a9..50a983022a3 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -1,18 +1,5 @@
-/*
- * Copyright 2011-2013 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright 2011-2022 Blender Foundation */
 
 #include <stdio.h>
 
diff --git a/intern/cycles/app/cycles_xml.h b/intern/cycles/app/cycles_xml.h
index 6a48980d8ea..8ddfdaddefd 100644
--- a/intern/cycles/app/cycles_xml.h
+++ b/intern/cycles/app/cycles_xml.h
@@ -1,18 +1,5 @@
-/*
- * Copyright 2011-2013 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright 2011-2022 Blender Foundation */
 
 #ifndef __CYCLES_XML_H__
 #define __CYCLES_XML_H__
diff --git a/intern/cycles/app/io_export_cycles_xml.py b/intern/cycles/app/io_export_cycles_xml.py
index d2c6dc493e8..0009995653e 100644
--- a/intern/cycles/app/io_export_cycles_xml.py
+++ b/intern/cycles/app/io_export_cycles_xml.py
@@ -1,18 +1,5 @@
-#
-# Copyright 2011-2013 Blender Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
+# SPDX-License-Identifier: Apache-2.0
+# Copyright 2011-2022 Blender Foundation
 
 # XML exporter for generating test files, not intended for end users
 
diff --git a/intern/cycles/app/oiio_output_driver.cpp b/intern/cycles/app/oiio_output_driver.cpp
index d791c89772f..477465c880b 100644
--- a/intern/cycles/app/oiio_output_driver.cpp
+++ b/intern/cycles/app/oiio_output_driver.cpp
@@ -1,18 +1,5 @@
-/*
- * Copyright 2021 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021-2022 Blender Foundation */
 
 #include "app/oiio_output_driver.h"
 
diff --git a/intern/cycles/app/oiio_output_driver.h b/intern/cycles/app/oiio_output_driver.h
index a5c88e0e890..5b3df88b414 100644
--- a/intern/cycles/app/oiio_output_driver.h
+++ b/intern/cycles/app/oiio_output_driver.h
@@ -1,18 +1,5 @@
-/*
- * Copyright 2021 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021-2022 Blender Foundation */
 
 #include "session/output_driver.h"
 
diff --git a/intern/cycles/blender/CCL_api.h b/intern/cycles/blender/CCL_api.h
index 233ffc8802c..c10bfaa1acf 100644
--- a/intern/cycles/blender/CCL_api.h
+++ b/intern/cycles/blender/CCL_api.h
@@ -1,18 +1,5 @@
-/*
- * Copyright 2011-2013 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright 2011-2022 Blender Foundation */
 
 #ifndef __CCL_API_H__
 #define __CCL_API_H__
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index 3de0a55b8b2..4919b99cfe0 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright 2011-2020 Blender Foundation
+# Copyright 2011-2022 Blender Foundation
 
 set(INC
   ..
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py
index 1ce25a253f9..5578e83b19a 100644
--- a/intern/cycles/blender/addon/__init__.py
+++ b/intern/cycles/blender/addon/__init__.py
@@ -1,18 +1,5 @@
-#
-# Copyright 2011-2013 Blender Foundation
-#
-

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list