diff options
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/hydra/curves.h | 7 | ||||
-rw-r--r-- | intern/cycles/hydra/mesh.h | 7 | ||||
-rw-r--r-- | intern/cycles/hydra/node_util.h | 2 | ||||
-rw-r--r-- | intern/cycles/hydra/pointcloud.h | 7 | ||||
-rw-r--r-- | intern/cycles/hydra/volume.h | 7 | ||||
-rw-r--r-- | intern/cycles/scene/integrator.cpp | 6 |
6 files changed, 21 insertions, 15 deletions
diff --git a/intern/cycles/hydra/curves.h b/intern/cycles/hydra/curves.h index a1ac4a86715..1eb4a51c0db 100644 --- a/intern/cycles/hydra/curves.h +++ b/intern/cycles/hydra/curves.h @@ -13,10 +13,11 @@ HDCYCLES_NAMESPACE_OPEN_SCOPE class HdCyclesCurves final : public HdCyclesGeometry<PXR_NS::HdBasisCurves, CCL_NS::Hair> { public: - HdCyclesCurves(const PXR_NS::SdfPath &rprimId + HdCyclesCurves( + const PXR_NS::SdfPath &rprimId #if PXR_VERSION < 2102 - , - const PXR_NS::SdfPath &instancerId = {} + , + const PXR_NS::SdfPath &instancerId = {} #endif ); ~HdCyclesCurves() override; diff --git a/intern/cycles/hydra/mesh.h b/intern/cycles/hydra/mesh.h index e7aa2e4fa94..8ec108534a1 100644 --- a/intern/cycles/hydra/mesh.h +++ b/intern/cycles/hydra/mesh.h @@ -14,10 +14,11 @@ HDCYCLES_NAMESPACE_OPEN_SCOPE class HdCyclesMesh final : public HdCyclesGeometry<PXR_NS::HdMesh, CCL_NS::Mesh> { public: - HdCyclesMesh(const PXR_NS::SdfPath &rprimId + HdCyclesMesh( + const PXR_NS::SdfPath &rprimId #if PXR_VERSION < 2102 - , - const PXR_NS::SdfPath &instancerId = {} + , + const PXR_NS::SdfPath &instancerId = {} #endif ); ~HdCyclesMesh() override; diff --git a/intern/cycles/hydra/node_util.h b/intern/cycles/hydra/node_util.h index e91f554cc45..009a4a9eb38 100644 --- a/intern/cycles/hydra/node_util.h +++ b/intern/cycles/hydra/node_util.h @@ -4,8 +4,8 @@ #pragma once -#include "hydra/config.h" #include "graph/node.h" +#include "hydra/config.h" #include <pxr/base/vt/value.h> diff --git a/intern/cycles/hydra/pointcloud.h b/intern/cycles/hydra/pointcloud.h index aa1768e807f..a014a389dcc 100644 --- a/intern/cycles/hydra/pointcloud.h +++ b/intern/cycles/hydra/pointcloud.h @@ -13,10 +13,11 @@ HDCYCLES_NAMESPACE_OPEN_SCOPE class HdCyclesPoints final : public HdCyclesGeometry<PXR_NS::HdPoints, CCL_NS::PointCloud> { public: - HdCyclesPoints(const PXR_NS::SdfPath &rprimId + HdCyclesPoints( + const PXR_NS::SdfPath &rprimId #if PXR_VERSION < 2102 - , - const PXR_NS::SdfPath &instancerId = {} + , + const PXR_NS::SdfPath &instancerId = {} #endif ); ~HdCyclesPoints() override; diff --git a/intern/cycles/hydra/volume.h b/intern/cycles/hydra/volume.h index 775a7cf069e..7fb5fa779b5 100644 --- a/intern/cycles/hydra/volume.h +++ b/intern/cycles/hydra/volume.h @@ -13,10 +13,11 @@ HDCYCLES_NAMESPACE_OPEN_SCOPE class HdCyclesVolume final : public HdCyclesGeometry<PXR_NS::HdVolume, CCL_NS::Volume> { public: - HdCyclesVolume(const PXR_NS::SdfPath &rprimId + HdCyclesVolume( + const PXR_NS::SdfPath &rprimId #if PXR_VERSION < 2102 - , - const PXR_NS::SdfPath &instancerId = {} + , + const PXR_NS::SdfPath &instancerId = {} #endif ); ~HdCyclesVolume() override; diff --git a/intern/cycles/scene/integrator.cpp b/intern/cycles/scene/integrator.cpp index 755fbb9542b..fd559178073 100644 --- a/intern/cycles/scene/integrator.cpp +++ b/intern/cycles/scene/integrator.cpp @@ -109,8 +109,10 @@ NODE_DEFINE(Integrator) SOCKET_INT(denoise_start_sample, "Start Sample to Denoise", 0); SOCKET_BOOLEAN(use_denoise_pass_albedo, "Use Albedo Pass for Denoiser", true); SOCKET_BOOLEAN(use_denoise_pass_normal, "Use Normal Pass for Denoiser", true); - SOCKET_ENUM( - denoiser_prefilter, "Denoiser Prefilter", denoiser_prefilter_enum, DENOISER_PREFILTER_ACCURATE); + SOCKET_ENUM(denoiser_prefilter, + "Denoiser Prefilter", + denoiser_prefilter_enum, + DENOISER_PREFILTER_ACCURATE); return type; } |