diff options
| author | Jacques Lucke <jacques@blender.org> | 2022-01-04 15:38:02 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2022-01-04 15:38:02 +0300 |
| commit | 3f3adef4a07df05fe92e0b948d4e2bc48f5ec3fc (patch) | |
| tree | bd663322534a595e3e07bf37bce66fb7d177fe2b /intern | |
| parent | c5b55a84f58aebc302de66fff13816d4beda38ee (diff) | |
| parent | b2867d436585bf7ff92f1d7e9a0de9bb5ede006b (diff) | |
Merge branch 'master' into temp-copy-on-writetemp-copy-on-write
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/types.h | 4 | ||||
| -rw-r--r-- | intern/cycles/scene/shader_nodes.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
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), diff --git a/intern/cycles/scene/shader_nodes.cpp b/intern/cycles/scene/shader_nodes.cpp index c345d5bbc9a..e8316ad41b4 100644 --- a/intern/cycles/scene/shader_nodes.cpp +++ b/intern/cycles/scene/shader_nodes.cpp @@ -5901,7 +5901,7 @@ VectorMapRangeNode::VectorMapRangeNode() : ShaderNode(get_node_type()) { } -void VectorMapRangeNode::expand(ShaderGraph *graph) +void VectorMapRangeNode::expand(ShaderGraph * /*graph*/) { } |