CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation. All rights reserved.
+# Copyright 2006 Blender Foundation
 
 # -----------------------------------------------------------------------------
 # Early Initialization

build_files/cmake/have_features.cmake

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2022 Blender Foundation. All rights reserved.
+# Copyright 2022 Blender Foundation
 
 # This file is used to test the system for headers & symbols.
 # Variables should use the `HAVE_` prefix.

build_files/cmake/macros.cmake

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation. All rights reserved.
+# Copyright 2006 Blender Foundation
 
 macro(list_insert_after
   list_id item_check item_add

build_files/cmake/platform/platform_apple.cmake

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2016 Blender Foundation. All rights reserved.
+# Copyright 2016 Blender Foundation
 
 # Libraries configuration for Apple.
 

build_files/cmake/platform/platform_apple_xcode.cmake

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2016 Blender Foundation. All rights reserved.
+# Copyright 2016 Blender Foundation
 
 # Xcode and system configuration for Apple.
 

build_files/cmake/platform/platform_old_libs_update.cmake

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2022 Blender Foundation. All rights reserved.
+# Copyright 2022 Blender Foundation
 
 # Auto update existing CMake caches for new libraries.
 

build_files/cmake/platform/platform_unix.cmake

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2016 Blender Foundation. All rights reserved.
+# Copyright 2016 Blender Foundation
 
 # Libraries configuration for any *nix system including Linux and Unix (excluding APPLE).
 
@@ -645,7 +645,7 @@ if(WITH_GHOST_WAYLAND)
   else()
     # Rocky8 packages have too old a version, a newer version exist in the pre-compiled libraries.
     find_path(WAYLAND_PROTOCOLS_DIR
-      NAMES unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
+      NAMES staging/xdg-activation/xdg-activation-v1.xml
       PATH_SUFFIXES share/wayland-protocols
       PATHS ${LIBDIR}/wayland-protocols
     )

build_files/cmake/platform/platform_win32.cmake

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2016 Blender Foundation. All rights reserved.
+# Copyright 2016 Blender Foundation
 
 # Libraries configuration for Windows.
 

extern/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation. All rights reserved.
+# Copyright 2006 Blender Foundation
 
 # Libs that adhere to strict flags
 add_subdirectory(curve_fit_nd)

extern/binreloc/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2008 Blender Foundation. All rights reserved.
+# Copyright 2008 Blender Foundation
 
 set(INC
   include

extern/bullet2/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation. All rights reserved.
+# Copyright 2006 Blender Foundation
 
 # avoid noisy warnings
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")

extern/ceres/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2012 Blender Foundation. All rights reserved.
+# Copyright 2012 Blender Foundation
 
 set(INC
   .

extern/clew/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation. All rights reserved.
+# Copyright 2006 Blender Foundation
 
 set(INC
   .

extern/cuew/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation. All rights reserved.
+# Copyright 2006 Blender Foundation
 
 set(INC
   .

extern/draco/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2019 Blender Foundation. All rights reserved.
+# Copyright 2019 Blender Foundation
 
 # Build Draco library.
 add_subdirectory(draco)

extern/gflags/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2016 Blender Foundation. All rights reserved.
+# Copyright 2016 Blender Foundation
 
 # Too noisy for code we don't maintain.
 if(CMAKE_COMPILER_IS_GNUCC)

extern/glog/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2016 Blender Foundation. All rights reserved.
+# Copyright 2016 Blender Foundation
 
 set(INC
   src

extern/gmock/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2014 Blender Foundation. All rights reserved.
+# Copyright 2014 Blender Foundation
 
 set(INC
   .

extern/gtest/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2014 Blender Foundation. All rights reserved.
+# Copyright 2014 Blender Foundation
 
 # avoid noisy warnings
 if(CMAKE_COMPILER_IS_GNUCC)

extern/hipew/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2021 Blender Foundation. All rights reserved.
+# Copyright 2021 Blender Foundation
 
 set(INC
   .

extern/lzma/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation. All rights reserved.
+# Copyright 2006 Blender Foundation
 
 # avoid noisy warnings
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")

extern/lzo/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation. All rights reserved.
+# Copyright 2006 Blender Foundation
 
 remove_strict_flags()
 

extern/mantaflow/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2016 Blender Foundation. All rights reserved.
+# Copyright 2016 Blender Foundation
 # The Original Code is: all of this file.
 # Contributor(s): Sebastian Barschkis (sebbas).
 

extern/quadriflow/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2019 Blender Foundation. All rights reserved.
+# Copyright 2019 Blender Foundation
 
 # avoid noisy warnings
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")

extern/sdlew/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation. All rights reserved.
+# Copyright 2006 Blender Foundation
 
 set(INC
   .

extern/smaa_areatex/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2017 Blender Foundation. All rights reserved.
+# Copyright 2017 Blender Foundation
 # The Original Code is: all of this file.
 # Contributor(s): IRIE Shinsuke.
 

extern/vulkan_memory_allocator/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2022 Blender Foundation. All rights reserved.
+# Copyright 2022 Blender Foundation
 
 set(INC
   .

extern/vulkan_memory_allocator/vk_mem_alloc_impl.cc

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2022 Blender Foundation. All rights reserved. */
+ * Copyright 2022 Blender Foundation */
 
 #ifdef __APPLE__
 #  include <MoltenVK/vk_mvk_moltenvk.h>

extern/wcwidth/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2013 Blender Foundation. All rights reserved.
+# Copyright 2013 Blender Foundation
 
 set(INC
   .

extern/xdnd/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2012 Blender Foundation. All rights reserved.
+# Copyright 2012 Blender Foundation
 
 set(INC
   .

intern/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation. All rights reserved.
+# Copyright 2006 Blender Foundation
 
 # add_subdirectory(atomic)  # header only
 add_subdirectory(atomic)

intern/atomic/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2020 Blender Foundation. All rights reserved.
+# Copyright 2020 Blender Foundation
 
 set(INC
   .

intern/atomic/atomic_ops.h

@@ -38,10 +38,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2016 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: adapted from jemalloc.
+ * The Original Code is adapted from jemalloc.
+ * Modifications Copyright (C) 2016 Blender Foundation.
  */
 
 /** \file

intern/atomic/intern/atomic_ops_ext.h

@@ -38,10 +38,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2016 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: adapted from jemalloc.
+ * The Original Code is adapted from jemalloc.
+ * Modifications Copyright (C) 2016 Blender Foundation.
  */
 
 /** \file

intern/atomic/intern/atomic_ops_unix.h

@@ -38,10 +38,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2016 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: adapted from jemalloc.
+ * The Original Code is adapted from jemalloc.
+ * Modifications Copyright (C) 2016 Blender Foundation.
  */
 
 /** \file

intern/atomic/intern/atomic_ops_utils.h

@@ -38,10 +38,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2016 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: adapted from jemalloc.
+ * The Original Code is adapted from jemalloc.
+ * Modifications Copyright (C) 2016 Blender Foundation.
  */
 
 /** \file

intern/cycles/device/metal/queue.mm

@@ -590,11 +590,10 @@ bool MetalDeviceQueue::enqueue(DeviceKernel kernel,
     [mtlComputeCommandEncoder setThreadgroupMemoryLength:shared_mem_bytes atIndex:0];
   }
 
-  MTLSize size_threadgroups_per_dispatch = MTLSizeMake(
-      divide_up(work_size, num_threads_per_block), 1, 1);
+  MTLSize size_threads_per_dispatch = MTLSizeMake(work_size, 1, 1);
   MTLSize size_threads_per_threadgroup = MTLSizeMake(num_threads_per_block, 1, 1);
-  [mtlComputeCommandEncoder dispatchThreadgroups:size_threadgroups_per_dispatch
-                           threadsPerThreadgroup:size_threads_per_threadgroup];
+  [mtlComputeCommandEncoder dispatchThreads:size_threads_per_dispatch
+                      threadsPerThreadgroup:size_threads_per_threadgroup];
 
   [mtlCommandBuffer_ addCompletedHandler:^(id<MTLCommandBuffer> command_buffer) {
     NSString *kernel_name = metal_kernel_pso->function.label;

intern/cycles/kernel/device/cuda/config.h

@@ -91,6 +91,7 @@
 #define ccl_gpu_kernel_postfix
 
 #define ccl_gpu_kernel_call(x) x
+#define ccl_gpu_kernel_within_bounds(i, n) ((i) < (n))
 
 /* Define a function object where "func" is the lambda body, and additional parameters are used to
  * specify captured state  */

intern/cycles/kernel/device/gpu/kernel.h

@@ -136,7 +136,7 @@ ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS)
 {
   const int global_index = ccl_gpu_global_id_x();
 
-  if (global_index < work_size) {
+  if (ccl_gpu_kernel_within_bounds(global_index, work_size)) {
     const int state = (path_index_array) ? path_index_array[global_index] : global_index;
     ccl_gpu_kernel_call(integrator_intersect_closest(NULL, state, render_buffer));
   }
@@ -150,7 +150,7 @@ ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS)
 {
   const int global_index = ccl_gpu_global_id_x();
 
-  if (global_index < work_size) {
+  if (ccl_gpu_kernel_within_bounds(global_index, work_size)) {
     const int state = (path_index_array) ? path_index_array[global_index] : global_index;
     ccl_gpu_kernel_call(integrator_intersect_shadow(NULL, state));
   }
@@ -164,7 +164,7 @@ ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS)
 {
   const int global_index = ccl_gpu_global_id_x();
 
-  if (global_index < work_size) {
+  if (ccl_gpu_kernel_within_bounds(global_index, work_size)) {
     const int state = (path_index_array) ? path_index_array[global_index] : global_index;
     ccl_gpu_kernel_call(integrator_intersect_subsurface(NULL, state));
   }
@@ -178,7 +178,7 @@ ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS)
 {
   const int global_index = ccl_gpu_global_id_x();
 
-  if (global_index < work_size) {
+  if (ccl_gpu_kernel_within_bounds(global_index, work_size)) {
     const int state = (path_index_array) ? path_index_array[global_index] : global_index;
     ccl_gpu_kernel_call(integrator_intersect_volume_stack(NULL, state));
   }
@@ -193,7 +193,7 @@ ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS)
 {
   const int global_index = ccl_gpu_global_id_x();
 
-  if (global_index < work_size) {
+  if (ccl_gpu_kernel_within_bounds(global_index, work_size)) {
     const int state = (path_index_array) ? path_index_array[global_index] : global_index;
     ccl_gpu_kernel_call(integrator_shade_background(NULL, state, render_buffer));
   }
@@ -208,7 +208,7 @@ ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS)
 {
   const int global_index = ccl_gpu_global_id_x();
 
-  if (global_index < work_size) {
+  if (ccl_gpu_kernel_within_bounds(global_index, work_size)) {
     const int state = (path_index_array) ? path_index_array[global_index] : global_index;
     ccl_gpu_kernel_call(integrator_shade_light(NULL, state, render_buffer));
   }
@@ -223,7 +223,7 @@ ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS)
 {
   const int global_index = ccl_gpu_global_id_x();
 
-  if (global_index < work_size) {
+  if (ccl_gpu_kernel_within_bounds(global_index, work_size)) {
     const int state = (path_index_array) ? path_index_array[global_index] : global_index;
     ccl_gpu_kernel_call(integrator_shade_shadow(NULL, state, render_buffer));
   }
@@ -238,7 +238,7 @@ ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS)
 {
   const int global_index = ccl_gpu_global_id_x();
 
-  if (global_index < work_size) {
+  if (ccl_gpu_kernel_within_bounds(global_index, work_size)) {
     const int state = (path_index_array) ? path_index_array[global_index] : global_index;
     ccl_gpu_kernel_call(integrator_shade_surface(NULL, state, render_buffer));
   }
@@ -257,7 +257,7 @@ ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS)
 {
   const int global_index = ccl_gpu_global_id_x();
 
-  if (global_index < work_size) {
+  if (ccl_gpu_kernel_within_bounds(global_index, work_size)) {
     const int state = (path_index_array) ? path_index_array[global_index] : global_index;
 
 #if defined(__KERNEL_METAL_APPLE__) && defined(__METALRT__)
@@ -281,7 +281,7 @@ ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS)
 {
   const int global_index = ccl_gpu_global_id_x();
 
-  if (global_index < work_size) {
+  if (ccl_gpu_kernel_within_bounds(global_index, work_size)) {
     const int state = (path_index_array) ? path_index_array[global_index] : global_index;
     ccl_gpu_kernel_call(integrator_shade_surface_mnee(NULL, state, render_buffer));
   }
@@ -296,7 +296,7 @@ ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS)
 {
   const int global_index = ccl_gpu_global_id_x();
 
-  if (global_index < work_size) {
+  if (ccl_gpu_kernel_within_bounds(global_index, work_size)) {
     const int state = (path_index_array) ? path_index_array[global_index] : global_index;
     ccl_gpu_kernel_call(integrator_shade_volume(NULL, state, render_buffer));
   }
@@ -492,7 +492,7 @@ ccl_gpu_kernel_threads(GPU_PARALLEL_SORTED_INDEX_DEFAULT_BLOCK_SIZE)
 {
   const int global_index = ccl_gpu_global_id_x();
 
-  if (global_index < work_size) {
+  if (ccl_gpu_kernel_within_bounds(global_index, work_size)) {
     const int from_state = active_terminated_states[active_states_offset + global_index];
     const int to_state = active_terminated_states[terminated_states_offset + global_index];
 
@@ -526,7 +526,7 @@ ccl_gpu_kernel_threads(GPU_PARALLEL_SORTED_INDEX_DEFAULT_BLOCK_SIZE)
 {
   const int global_index = ccl_gpu_global_id_x();
 
-  if (global_index < work_size) {
+  if (ccl_gpu_kernel_within_bounds(global_index, work_size)) {
     const int from_state = active_terminated_states[active_states_offset + global_index];
     const int to_state = active_terminated_states[terminated_states_offset + global_index];
 

intern/cycles/kernel/device/hip/config.h

@@ -34,6 +34,7 @@
 #define ccl_gpu_kernel_postfix
 
 #define ccl_gpu_kernel_call(x) x
+#define ccl_gpu_kernel_within_bounds(i, n) ((i) < (n))
 
 /* Define a function object where "func" is the lambda body, and additional parameters are used to
  * specify captured state  */

intern/cycles/kernel/device/metal/compat.h

@@ -143,6 +143,7 @@ void kernel_gpu_##name::run(thread MetalKernelContext& context, \
 
 #define ccl_gpu_kernel_postfix
 #define ccl_gpu_kernel_call(x) context.x
+#define ccl_gpu_kernel_within_bounds(i,n) true
 
 /* define a function object where "func" is the lambda body, and additional parameters are used to specify captured state  */
 #define ccl_gpu_kernel_lambda(func, ...) \

intern/cycles/kernel/device/metal/kernel.metal

@@ -289,9 +289,8 @@ bool metalrt_shadow_all_hit(constant KernelParamsMetal &launch_params_metal,
     }
 
     if (ray_tmax >= max_recorded_t) {
-      /* Accept hit, so that we don't consider any more hits beyond the distance of the
-       * current hit anymore. */
-      payload.result = true;
+      /* Ray hits are not guaranteed to be ordered by distance so don't exit early here.
+       * Continue search. */
       return true;
     }
 

intern/cycles/kernel/device/oneapi/compat.h

@@ -101,6 +101,7 @@ void oneapi_kernel_##name(KernelGlobalsGPU *ccl_restrict kg, \
 #endif
 
 #define ccl_gpu_kernel_call(x) ((ONEAPIKernelContext*)kg)->x
+#define ccl_gpu_kernel_within_bounds(i, n) ((i) < (n))
 
 #define ccl_gpu_kernel_lambda(func, ...) \
   struct KernelLambda \

intern/eigen/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2015 Blender Foundation. All rights reserved.
+# Copyright 2015 Blender Foundation
 
 set(INC
   .

intern/eigen/eigen_capi.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2015 Blender Foundation. All rights reserved. */
+ * Copyright 2015 Blender Foundation */
 
 /** \file
  * \ingroup intern_eigen

intern/eigen/intern/eigenvalues.cc

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2015 Blender Foundation. All rights reserved. */
+ * Copyright 2015 Blender Foundation */
 
 #ifndef __EIGEN3_EIGENVALUES_C_API_CC__
 #define __EIGEN3_EIGENVALUES_C_API_CC__

intern/eigen/intern/eigenvalues.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2015 Blender Foundation. All rights reserved. */
+ * Copyright 2015 Blender Foundation */
 
 /** \file
  * \ingroup intern_eigen

intern/eigen/intern/matrix.cc

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2018 Blender Foundation. All rights reserved. */
+ * Copyright 2018 Blender Foundation */
 
 /** \file
  * \ingroup intern_eigen

intern/eigen/intern/matrix.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2015 Blender Foundation. All rights reserved. */
+ * Copyright 2015 Blender Foundation */
 
 /** \file
  * \ingroup intern_eigen

intern/eigen/intern/svd.cc

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2015 Blender Foundation. All rights reserved. */
+ * Copyright 2015 Blender Foundation */
 
 /** \file
  * \ingroup intern_eigen

intern/eigen/intern/svd.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2015 Blender Foundation. All rights reserved. */
+ * Copyright 2015 Blender Foundation */
 
 /** \file
  * \ingroup intern_eigen

intern/ffmpeg/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2020 Blender Foundation. All rights reserved.
+# Copyright 2020 Blender Foundation
 
 if(WITH_GTESTS)
   set(TEST_SRC

intern/ghost/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation. All rights reserved.
+# Copyright 2006 Blender Foundation
 
 set(INC
   .

intern/ghost/GHOST_ISystemPaths.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2009 Blender Foundation. All rights reserved. */
+ * Copyright 2009 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/GHOST_Path-api.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2010 Blender Foundation. All rights reserved. */
+ * Copyright 2010 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_Context.cpp

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2013 Blender Foundation. All rights reserved. */
+ * Copyright 2013 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_Context.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2013 Blender Foundation. All rights reserved. */
+ * Copyright 2013 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_ContextCGL.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2014 Blender Foundation. All rights reserved. */
+ * Copyright 2014 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_ContextCGL.mm

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2013 Blender Foundation. All rights reserved. */
+ * Copyright 2013 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_ContextEGL.cpp

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2013 Blender Foundation. All rights reserved. */
+ * Copyright 2013 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_ContextEGL.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2013 Blender Foundation. All rights reserved. */
+ * Copyright 2013 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_ContextGLX.cpp

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2014 Blender Foundation. All rights reserved. */
+ * Copyright 2014 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_ContextGLX.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2014 Blender Foundation. All rights reserved. */
+ * Copyright 2014 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_ContextNone.cpp

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2013 Blender Foundation. All rights reserved. */
+ * Copyright 2013 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_ContextNone.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2013 Blender Foundation. All rights reserved. */
+ * Copyright 2013 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_ContextSDL.cpp

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2014 Blender Foundation. All rights reserved. */
+ * Copyright 2014 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_ContextSDL.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2014 Blender Foundation. All rights reserved. */
+ * Copyright 2014 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_ContextWGL.cpp

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2013 Blender Foundation. All rights reserved. */
+ * Copyright 2013 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_ContextWGL.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2013 Blender Foundation. All rights reserved. */
+ * Copyright 2013 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_DropTargetX11.cpp

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2012 Blender Foundation. All rights reserved. */
+ * Copyright 2012 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_DropTargetX11.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2012 Blender Foundation. All rights reserved. */
+ * Copyright 2012 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_Path-api.cpp

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2010 Blender Foundation. All rights reserved. */
+ * Copyright 2010 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_PathUtils.cpp

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2010 Blender Foundation. All rights reserved. */
+ * Copyright 2010 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_PathUtils.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2010 Blender Foundation. All rights reserved. */
+ * Copyright 2010 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_SystemPaths.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2009 Blender Foundation. All rights reserved. */
+ * Copyright 2009 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_SystemPathsCocoa.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2010 Blender Foundation. All rights reserved. */
+ * Copyright 2010 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_SystemPathsCocoa.mm

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2010 Blender Foundation. All rights reserved. */
+ * Copyright 2010 Blender Foundation */
 
 #import <Foundation/Foundation.h>
 

intern/ghost/intern/GHOST_SystemPathsUnix.cpp

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2010 Blender Foundation. All rights reserved. */
+ * Copyright 2010 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_SystemPathsUnix.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2010 Blender Foundation. All rights reserved. */
+ * Copyright 2010 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_SystemPathsWin32.cpp

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2011 Blender Foundation. All rights reserved. */
+ * Copyright 2011 Blender Foundation */
 
 /** \file
  * \ingroup GHOST

intern/ghost/intern/GHOST_SystemWayland.cpp

@@ -205,6 +205,14 @@ static bool use_gnome_confine_hack = false;
 
 #define WL_NAME_UNSET uint32_t(-1)
 
+/**
+ * Initializer for GHOST integer coordinates from `wl_fixed_t`,
+ * taking window scale into account.
+ */
+#define WL_FIXED_TO_INT_FOR_WINDOW_V2(win, xy) \
+  wl_fixed_to_int((win)->wl_fixed_to_window((xy)[0])), \
+      wl_fixed_to_int((win)->wl_fixed_to_window((xy)[1])),
+
 /** \} */
 
 /* -------------------------------------------------------------------- */
@@ -1925,8 +1933,6 @@ static void relative_pointer_handle_relative_motion_impl(GWL_Seat *seat,
                                                          GHOST_WindowWayland *win,
                                                          const wl_fixed_t xy[2])
 {
-  const wl_fixed_t scale = win->scale();
-
   seat->pointer.xy[0] = xy[0];
   seat->pointer.xy[1] = xy[1];
 
@@ -1937,21 +1943,19 @@ static void relative_pointer_handle_relative_motion_impl(GWL_Seat *seat,
     /* Needed or the cursor is considered outside the window and doesn't restore the location. */
     bounds.m_r -= 1;
     bounds.m_b -= 1;
-
-    bounds.m_l = wl_fixed_from_int(bounds.m_l) / scale;
-    bounds.m_t = wl_fixed_from_int(bounds.m_t) / scale;
-    bounds.m_r = wl_fixed_from_int(bounds.m_r) / scale;
-    bounds.m_b = wl_fixed_from_int(bounds.m_b) / scale;
+    bounds.m_l = win->wl_fixed_from_window(wl_fixed_from_int(bounds.m_l));
+    bounds.m_t = win->wl_fixed_from_window(wl_fixed_from_int(bounds.m_t));
+    bounds.m_r = win->wl_fixed_from_window(wl_fixed_from_int(bounds.m_r));
+    bounds.m_b = win->wl_fixed_from_window(wl_fixed_from_int(bounds.m_b));
     bounds.clampPoint(UNPACK2(seat->pointer.xy));
   }
 #endif
-  seat->system->pushEvent_maybe_pending(
-      new GHOST_EventCursor(seat->system->getMilliSeconds(),
-                            GHOST_kEventCursorMove,
-                            win,
-                            wl_fixed_to_int(scale * seat->pointer.xy[0]),
-                            wl_fixed_to_int(scale * seat->pointer.xy[1]),
-                            GHOST_TABLET_DATA_NONE));
+  const int event_xy[2] = {WL_FIXED_TO_INT_FOR_WINDOW_V2(win, seat->pointer.xy)};
+  seat->system->pushEvent_maybe_pending(new GHOST_EventCursor(seat->system->getMilliSeconds(),
+                                                              GHOST_kEventCursorMove,
+                                                              win,
+                                                              UNPACK2(event_xy),
+                                                              GHOST_TABLET_DATA_NONE));
 }
 
 static void relative_pointer_handle_relative_motion(
@@ -1968,10 +1972,9 @@ static void relative_pointer_handle_relative_motion(
   if (wl_surface *wl_surface_focus = seat->pointer.wl_surface_window) {
     CLOG_INFO(LOG, 2, "relative_motion");
     GHOST_WindowWayland *win = ghost_wl_surface_user_data(wl_surface_focus);
-    const wl_fixed_t scale = win->scale();
     const wl_fixed_t xy_next[2] = {
-        seat->pointer.xy[0] + (dx / scale),
-        seat->pointer.xy[1] + (dy / scale),
+        seat->pointer.xy[0] + win->wl_fixed_from_window(dx),
+        seat->pointer.xy[1] + win->wl_fixed_from_window(dy),
     };
     relative_pointer_handle_relative_motion_impl(seat, win, xy_next);
   }
@@ -2000,12 +2003,7 @@ static void dnd_events(const GWL_Seat *const seat, const GHOST_TEventType event)
   /* NOTE: `seat->data_offer_dnd_mutex` must already be locked. */
   if (wl_surface *wl_surface_focus = seat->wl_surface_window_focus_dnd) {
     GHOST_WindowWayland *win = ghost_wl_surface_user_data(wl_surface_focus);
-    const wl_fixed_t scale = win->scale();
-    const int event_xy[2] = {
-        wl_fixed_to_int(scale * seat->data_offer_dnd->dnd.xy[0]),
-        wl_fixed_to_int(scale * seat->data_offer_dnd->dnd.xy[1]),
-    };
-
+    const int event_xy[2] = {WL_FIXED_TO_INT_FOR_WINDOW_V2(win, seat->data_offer_dnd->dnd.xy)};
     const uint64_t time = seat->system->getMilliSeconds();
     for (size_t i = 0; i < ARRAY_SIZE(ghost_wl_mime_preference_order_type); i++) {
       const GHOST_TDragnDropTypes type = ghost_wl_mime_preference_order_type[i];
@@ -2477,13 +2475,12 @@ static void data_device_handle_drop(void *data, struct wl_data_device * /*wl_dat
       }
 
       CLOG_INFO(LOG, 2, "drop_read_uris_fn file_count=%d", flist->count);
-      const wl_fixed_t scale = win->scale();
+      const int event_xy[2] = {WL_FIXED_TO_INT_FOR_WINDOW_V2(win, xy)};
       system->pushEvent_maybe_pending(new GHOST_EventDragnDrop(system->getMilliSeconds(),
                                                                GHOST_kEventDraggingDropDone,
                                                                GHOST_kDragnDropTypeFilenames,
                                                                win,
-                                                               wl_fixed_to_int(scale * xy[0]),
-                                                               wl_fixed_to_int(scale * xy[1]),
+                                                               UNPACK2(event_xy),
                                                                flist));
     }
     else if (ELEM(mime_receive, ghost_wl_mime_text_plain, ghost_wl_mime_text_utf8)) {
@@ -2685,14 +2682,12 @@ static void pointer_handle_enter(void *data,
 
   seat->system->cursor_shape_set(win->getCursorShape());
 
-  const wl_fixed_t scale = win->scale();
-  seat->system->pushEvent_maybe_pending(
-      new GHOST_EventCursor(seat->system->getMilliSeconds(),
-                            GHOST_kEventCursorMove,
-                            win,
-                            wl_fixed_to_int(scale * seat->pointer.xy[0]),
-                            wl_fixed_to_int(scale * seat->pointer.xy[1]),
-                            GHOST_TABLET_DATA_NONE));
+  const int event_xy[2] = {WL_FIXED_TO_INT_FOR_WINDOW_V2(win, seat->pointer.xy)};
+  seat->system->pushEvent_maybe_pending(new GHOST_EventCursor(seat->system->getMilliSeconds(),
+                                                              GHOST_kEventCursorMove,
+                                                              win,
+                                                              UNPACK2(event_xy),
+                                                              GHOST_TABLET_DATA_NONE));
 }
 
 static void pointer_handle_leave(void *data,
@@ -2723,14 +2718,12 @@ static void pointer_handle_motion(void *data,
   if (wl_surface *wl_surface_focus = seat->pointer.wl_surface_window) {
     CLOG_INFO(LOG, 2, "motion");
     GHOST_WindowWayland *win = ghost_wl_surface_user_data(wl_surface_focus);
-    const wl_fixed_t scale = win->scale();
-    seat->system->pushEvent_maybe_pending(
-        new GHOST_EventCursor(seat->system->getMilliSeconds(),
-                              GHOST_kEventCursorMove,
-                              win,
-                              wl_fixed_to_int(scale * seat->pointer.xy[0]),
-                              wl_fixed_to_int(scale * seat->pointer.xy[1]),
-                              GHOST_TABLET_DATA_NONE));
+    const int event_xy[2] = {WL_FIXED_TO_INT_FOR_WINDOW_V2(win, seat->pointer.xy)};
+    seat->system->pushEvent_maybe_pending(new GHOST_EventCursor(seat->system->getMilliSeconds(),
+                                                                GHOST_kEventCursorMove,
+                                                                win,
+                                                                UNPACK2(event_xy),
+                                                                GHOST_TABLET_DATA_NONE));
   }
   else {
     CLOG_INFO(LOG, 2, "motion (skipped)");
@@ -2849,13 +2842,12 @@ static void pointer_handle_frame(void *data, struct wl_pointer * /*wl_pointer*/)
   if (seat->pointer_scroll.smooth_xy[0] || seat->pointer_scroll.smooth_xy[1]) {
     if (wl_surface *wl_surface_focus = seat->pointer.wl_surface_window) {
       GHOST_WindowWayland *win = ghost_wl_surface_user_data(wl_surface_focus);
-      const wl_fixed_t scale = win->scale();
+      const int event_xy[2] = {WL_FIXED_TO_INT_FOR_WINDOW_V2(win, seat->pointer.xy)};
       seat->system->pushEvent_maybe_pending(new GHOST_EventTrackpad(
           seat->system->getMilliSeconds(),
           win,
           GHOST_kTrackpadEventScroll,
-          wl_fixed_to_int(scale * seat->pointer.xy[0]),
-          wl_fixed_to_int(scale * seat->pointer.xy[1]),
+          UNPACK2(event_xy),
           /* NOTE: scaling the delta doesn't seem necessary.
            * NOTE: inverting delta gives correct results, see: QTBUG-85767.
            * NOTE: the preference to invert scrolling (in GNOME at least)
@@ -3082,11 +3074,7 @@ static void gesture_pinch_handle_update(void *data,
       &seat->pointer_gesture_pinch.rotation, rotation);
 
   if (win) {
-    const wl_fixed_t win_scale = win->scale();
-    const int32_t event_xy[2] = {
-        wl_fixed_to_int(win_scale * seat->pointer.xy[0]),
-        wl_fixed_to_int(win_scale * seat->pointer.xy[1]),
-    };
+    const int event_xy[2] = {WL_FIXED_TO_INT_FOR_WINDOW_V2(win, seat->pointer.xy)};
     if (scale_as_delta_px) {
       seat->system->pushEvent_maybe_pending(
           new GHOST_EventTrackpad(seat->system->getMilliSeconds(),
@@ -3566,14 +3554,12 @@ static void tablet_tool_handle_frame(void *data,
   /* No need to check the surfaces origin, it's already known to be owned by GHOST. */
   if (wl_surface *wl_surface_focus = seat->tablet.wl_surface_window) {
     GHOST_WindowWayland *win = ghost_wl_surface_user_data(wl_surface_focus);
-    const wl_fixed_t scale = win->scale();
-    seat->system->pushEvent_maybe_pending(
-        new GHOST_EventCursor(seat->system->getMilliSeconds(),
-                              GHOST_kEventCursorMove,
-                              win,
-                              wl_fixed_to_int(scale * seat->tablet.xy[0]),
-                              wl_fixed_to_int(scale * seat->tablet.xy[1]),
-                              tablet_tool->data));
+    const int event_xy[2] = {WL_FIXED_TO_INT_FOR_WINDOW_V2(win, seat->tablet.xy)};
+    seat->system->pushEvent_maybe_pending(new GHOST_EventCursor(seat->system->getMilliSeconds(),
+                                                                GHOST_kEventCursorMove,
+                                                                win,
+                                                                UNPACK2(event_xy),
+                                                                tablet_tool->data));
     if (tablet_tool->proximity == false) {
       seat->system->cursor_shape_set(win->getCursorShape());
     }
@@ -6020,7 +6006,6 @@ static GHOST_TSuccess getCursorPositionClientRelative_impl(
     int32_t &x,
     int32_t &y)
 {
-  const wl_fixed_t scale = win->scale();
 
   if (win->getCursorGrabModeIsWarp()) {
     /* As the cursor is restored at the warped location,
@@ -6037,18 +6022,19 @@ static GHOST_TSuccess getCursorPositionClientRelative_impl(
     };
 
     GHOST_Rect wrap_bounds_scale;
-    wrap_bounds_scale.m_l = wl_fixed_from_int(wrap_bounds.m_l) / scale;
-    wrap_bounds_scale.m_t = wl_fixed_from_int(wrap_bounds.m_t) / scale;
-    wrap_bounds_scale.m_r = wl_fixed_from_int(wrap_bounds.m_r) / scale;
-    wrap_bounds_scale.m_b = wl_fixed_from_int(wrap_bounds.m_b) / scale;
+
+    wrap_bounds_scale.m_l = win->wl_fixed_from_window(wl_fixed_from_int(wrap_bounds.m_l));
+    wrap_bounds_scale.m_t = win->wl_fixed_from_window(wl_fixed_from_int(wrap_bounds.m_t));
+    wrap_bounds_scale.m_r = win->wl_fixed_from_window(wl_fixed_from_int(wrap_bounds.m_r));
+    wrap_bounds_scale.m_b = win->wl_fixed_from_window(wl_fixed_from_int(wrap_bounds.m_b));
     wrap_bounds_scale.wrapPoint(UNPACK2(xy_wrap), 0, win->getCursorGrabAxis());
 
-    x = wl_fixed_to_int(scale * xy_wrap[0]);
-    y = wl_fixed_to_int(scale * xy_wrap[1]);
+    x = wl_fixed_to_int(win->wl_fixed_to_window(xy_wrap[0]));
+    y = wl_fixed_to_int(win->wl_fixed_to_window(xy_wrap[1]));
   }
   else {
-    x = wl_fixed_to_int(scale * seat_state_pointer->xy[0]);
-    y = wl_fixed_to_int(scale * seat_state_pointer->xy[1]);
+    x = win->wl_fixed_to_window(seat_state_pointer->xy[0]);
+    y = win->wl_fixed_to_window(seat_state_pointer->xy[1]);
   }
 
   return GHOST_kSuccess;
@@ -6065,10 +6051,9 @@ static GHOST_TSuccess setCursorPositionClientRelative_impl(GWL_Seat *seat,
   if (!seat->wp_relative_pointer) {
     return GHOST_kFailure;
   }
-  const wl_fixed_t scale = win->scale();
-  const wl_fixed_t xy_next[2] = {
-      wl_fixed_from_int(x) / scale,
-      wl_fixed_from_int(y) / scale,
+  const wl_fixed_t xy_next[2]{
+      win->wl_fixed_from_window(wl_fixed_from_int(x)),
+      win->wl_fixed_from_window(wl_fixed_from_int(y)),
   };
 
   /* As the cursor was "warped" generate an event at the new location. */

intern/ghost/intern/GHOST_WindowWayland.cpp

@@ -87,6 +87,29 @@ static void gwl_xdg_decor_window_destroy(WGL_XDG_Decor_Window *decor)
 /** \name Internal #GWL_Window
  * \{ */
 
+#ifdef USE_EVENT_BACKGROUND_THREAD
+
+enum eGWL_PendingWindowActions {
+  /**
+   * The state of the window frame has changed, apply the state from #GWL_Window::frame_pending.
+   */
+  PENDING_WINDOW_FRAME_CONFIGURE = 0,
+  /** The EGL buffer must be resized to match #GWL_WindowFrame::size. */
+  PENDING_EGL_WINDOW_RESIZE,
+#  ifdef GHOST_OPENGL_ALPHA
+  /** Draw an opaque region behind the window. */
+  PENDING_OPAQUE_SET,
+#  endif
+  /**
+   * The DPI for a monitor has changed or the monitors (outputs)
+   * this window is visible on may have changed. Recalculate the windows scale.
+   */
+  PENDING_OUTPUT_SCALE_UPDATE,
+};
+#  define PENDING_NUM (PENDING_OUTPUT_SCALE_UPDATE + 1)
+
+#endif /* USE_EVENT_BACKGROUND_THREAD */
+
 struct GWL_WindowFrame {
   int32_t size[2] = {0, 0};
   bool is_maximised = false;
@@ -148,7 +171,7 @@ struct GWL_Window {
    * These pending actions can't be performed when WAYLAND handlers are running from a thread.
    * Postpone their execution until the main thread can handle them.
    */
-  std::atomic<bool> pending_actions[3];
+  std::atomic<bool> pending_actions[PENDING_NUM];
 #endif /* USE_EVENT_BACKGROUND_THREAD */
 };
 
@@ -366,25 +389,6 @@ static void gwl_window_frame_update_from_pending(GWL_Window *win);
 
 #ifdef USE_EVENT_BACKGROUND_THREAD
 
-enum eGWL_PendingWindowActions {
-  /**
-   * The state of the window frame has changed, apply the state from #GWL_Window::frame_pending.
-   */
-  PENDING_WINDOW_FRAME_CONFIGURE = 0,
-  /** The EGL buffer must be resized to match #GWL_WindowFrame::size. */
-  PENDING_EGL_WINDOW_RESIZE,
-#  ifdef GHOST_OPENGL_ALPHA
-  /** Draw an opaque region behind the window. */
-  PENDING_OPAQUE_SET,
-#  endif
-  /**
-   * The DPI for a monitor has changed or the monitors (outputs)
-   * this window is visible on may have changed. Recalculate the windows scale.
-   */
-  PENDING_OUTPUT_SCALE_UPDATE,
-};
-#  define PENDING_NUM (PENDING_OUTPUT_SCALE_UPDATE + 1)
-
 static void gwl_window_pending_actions_tag(GWL_Window *win, enum eGWL_PendingWindowActions type)
 {
   win->pending_actions[int(type)].store(true);
@@ -1384,6 +1388,16 @@ wl_fixed_t GHOST_WindowWayland::scale_fractional() const
   return window_->scale_fractional;
 }
 
+wl_fixed_t GHOST_WindowWayland::wl_fixed_from_window(wl_fixed_t value) const
+{
+  return value / window_->scale;
+}
+
+wl_fixed_t GHOST_WindowWayland::wl_fixed_to_window(wl_fixed_t value) const
+{
+  return value * window_->scale;
+}
+
 wl_surface *GHOST_WindowWayland::wl_surface() const
 {
   return window_->wl_surface;

intern/ghost/intern/GHOST_WindowWayland.h

@@ -144,6 +144,9 @@ class GHOST_WindowWayland : public GHOST_Window {
   struct wl_surface *wl_surface() const;
   const std::vector<GWL_Output *> &outputs();
 
+  wl_fixed_t wl_fixed_from_window(wl_fixed_t value) const;
+  wl_fixed_t wl_fixed_to_window(wl_fixed_t value) const;
+
   /* WAYLAND window-level functions. */
 
   GHOST_TSuccess close();

intern/ghost/test/multitest/stubs.c

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2013 Blender Foundation. All rights reserved. */
+ * Copyright 2013 Blender Foundation */
 
 #include <stdlib.h>
 

intern/guardedalloc/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation. All rights reserved.
+# Copyright 2006 Blender Foundation
 
 if(HAVE_MALLOC_STATS_H)
   add_definitions(-DHAVE_MALLOC_STATS_H)

intern/guardedalloc/intern/mallocn_intern.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2013 Blender Foundation. All rights reserved. */
+ * Copyright 2013 Blender Foundation */
 
 /** \file
  * \ingroup intern_mem

intern/iksolver/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation. All rights reserved.
+# Copyright 2006 Blender Foundation
 
 set(INC
   intern

intern/itasc/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2006 Blender Foundation. All rights reserved.
+# Copyright 2006 Blender Foundation
 remove_strict_flags()
 set(INC
 

intern/libc_compat/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2015 Blender Foundation. All rights reserved.
+# Copyright 2015 Blender Foundation
 
 set(INC
   .

intern/libc_compat/libc_compat.c

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2020 Blender Foundation. All rights reserved. */
+ * Copyright 2020 Blender Foundation */
 
 /* On Linux, precompiled libraries may be made with an glibc version that is
  * incompatible with the system libraries that Blender is built on. To solve

intern/libmv/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright 2011 Blender Foundation. All rights reserved.
+# Copyright 2011 Blender Foundation
 
 # NOTE: This file is automatically generated by bundle.sh script
 #       If you're doing changes in this file, please update template

intern/libmv/intern/autotrack.cc

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2014 Blender Foundation. All rights reserved. */
+ * Copyright 2014 Blender Foundation */
 
 #include "intern/autotrack.h"
 #include "intern/tracksN.h"

intern/libmv/intern/autotrack.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2014 Blender Foundation. All rights reserved. */
+ * Copyright 2014 Blender Foundation */
 
 #ifndef LIBMV_C_API_AUTOTRACK_H_
 #define LIBMV_C_API_AUTOTRACK_H_

intern/libmv/intern/camera_intrinsics.cc

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2011 Blender Foundation. All rights reserved. */
+ * Copyright 2011 Blender Foundation */
 
 #include "intern/camera_intrinsics.h"
 #include "intern/utildefines.h"

intern/libmv/intern/camera_intrinsics.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2011 Blender Foundation. All rights reserved. */
+ * Copyright 2011 Blender Foundation */
 
 #ifndef LIBMV_C_API_CAMERA_INTRINSICS_H_
 #define LIBMV_C_API_CAMERA_INTRINSICS_H_

intern/libmv/intern/detector.cc

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2011 Blender Foundation. All rights reserved. */
+ * Copyright 2011 Blender Foundation */
 
 #include "intern/detector.h"
 #include "intern/image.h"

intern/libmv/intern/detector.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2011 Blender Foundation. All rights reserved. */
+ * Copyright 2011 Blender Foundation */
 
 #ifndef LIBMV_C_API_DETECTOR_H_
 #define LIBMV_C_API_DETECTOR_H_

intern/libmv/intern/frame_accessor.cc

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2014 Blender Foundation. All rights reserved. */
+ * Copyright 2014 Blender Foundation */
 
 #include "intern/frame_accessor.h"
 #include "intern/image.h"

intern/libmv/intern/frame_accessor.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2014 Blender Foundation. All rights reserved. */
+ * Copyright 2014 Blender Foundation */
 
 #ifndef LIBMV_C_API_FRAME_ACCESSOR_H_
 #define LIBMV_C_API_FRAME_ACCESSOR_H_

intern/libmv/intern/homography.cc

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2011 Blender Foundation. All rights reserved. */
+ * Copyright 2011 Blender Foundation */
 
 #include "intern/homography.h"
 #include "intern/utildefines.h"