[Bf-blender-cvs] [ca143fafa67] master: Cleanup: Silence "integer conversion resulted in a change of sign" warning in Cycles kernel code
Patrick Mours
noreply at git.blender.org
Mon Jan 3 16:29:14 CET 2022
Commit: ca143fafa674f5dbec39ded3ecbba4b0abfe93db
Author: Patrick Mours
Date: Mon Jan 3 16:26:15 2022 +0100
Branches: master
https://developer.blender.org/rBca143fafa674f5dbec39ded3ecbba4b0abfe93db
Cleanup: Silence "integer conversion resulted in a change of sign" warning in Cycles kernel code
Occured because "PATH_RAY_SHADOW_CATCHER_BACKGROUND" is expressed as an unsigned
integer, because too large for a signed integer, but the "PathRayFlag" enum type defaulted to a
signed integer still.
===================================================================
M intern/cycles/kernel/types.h
===================================================================
diff --git a/intern/cycles/kernel/types.h b/intern/cycles/kernel/types.h
index 20abea37649..1d0537f9547 100644
--- a/intern/cycles/kernel/types.h
+++ b/intern/cycles/kernel/types.h
@@ -202,7 +202,7 @@ enum SamplingPattern {
/* These flags values correspond to `raytypes` in `osl.cpp`, so keep them in sync! */
-enum PathRayFlag {
+enum PathRayFlag : uint32_t {
/* --------------------------------------------------------------------
* Ray visibility.
*
@@ -1559,7 +1559,7 @@ enum {
/* Kernel Features */
-enum KernelFeatureFlag : unsigned int {
+enum KernelFeatureFlag : uint32_t {
/* Shader nodes. */
KERNEL_FEATURE_NODE_BSDF = (1U << 0U),
KERNEL_FEATURE_NODE_EMISSION = (1U << 1U),
More information about the Bf-blender-cvs
mailing list