Cycles: Remove "return" and "assert" from oneAPI kernel code

5 files changed, 2 insertions, 6 deletions

diff --git a/intern/cycles/kernel/device/oneapi/kernel.cpp b/intern/cycles/kernel/device/oneapi/kernel.cpp
index 22b2fd03706..332ad430f20 100644
--- a/intern/cycles/kernel/device/oneapi/kernel.cpp
+++ b/intern/cycles/kernel/device/oneapi/kernel.cpp
@@ -645,13 +645,9 @@ bool oneapi_enqueue_kernel(KernelContext *kernel_context,
         /* Unsupported kernels */
         case DEVICE_KERNEL_NUM:
         case DEVICE_KERNEL_INTEGRATOR_MEGAKERNEL:
-          assert(0);
-          return false;
+          kernel_assert(0);
+          break;
       }
-
-      /* Unknown kernel. */
-      assert(0);
-      return false;
     });
   }
   catch (sycl::exception const &e) {
diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject 4d67fb6e2773619392b3d2099188ae742ef9662
+Subproject a2eb507891449a0b67582be9561840075513661
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject 32baafe44dc56edd1baf6e5a16b4439ded8238f
+Subproject 7a8502871c34db0343cc7de52d6b49b15a84238
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject 42da56aa73726710107031787af5eea18679798
+Subproject 95107484d076bc965239942e857c83433bfa86d
diff --git a/source/tools b/source/tools
-Subproject 548055f40213c775a6b77025525c91e8466e70d
+Subproject da8bdd7244c7b6c2eadf4c949ff391d0cc43027