[Bf-blender-cvs] [805d1063a05] blender-v3.3-release: Cycles: Remove "return" and "assert" from oneAPI kernel code

[Nikita Sirgienko]

Commit: 805d1063a052d07e26e9c510d1b293b7b95172ed
Author: Nikita Sirgienko
Date:   Mon Aug 29 19:16:41 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB805d1063a052d07e26e9c510d1b293b7b95172ed

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

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

M       intern/cycles/kernel/device/oneapi/kernel.cpp
M       release/datafiles/locale
M       release/scripts/addons
M       release/scripts/addons_contrib
M       source/tools

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

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
index 4d67fb6e277..a2eb5078914 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 4d67fb6e2773619392b3d2099188ae742ef9662a
+Subproject commit a2eb507891449a0b67582be9561840075513661d
diff --git a/release/scripts/addons b/release/scripts/addons
index 32baafe44dc..7a8502871c3 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 32baafe44dc56edd1baf6e5a16b4439ded8238f2
+Subproject commit 7a8502871c34db0343cc7de52d6b49b15a84238a
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 42da56aa737..95107484d07 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 42da56aa73726710107031787af5eea186797984
+Subproject commit 95107484d076bc965239942e857c83433bfa86d7
diff --git a/source/tools b/source/tools
index 548055f4021..da8bdd7244c 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 548055f40213c775a6b77025525c91e8466e70d6
+Subproject commit da8bdd7244c7b6c2eadf4c949ff391d0cc430275

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs