Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CyclesOptions : Remove samplingPattern #5726

Merged
merged 1 commit into from
Mar 12, 2024
Merged

CyclesOptions : Remove samplingPattern #5726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
1.4.x.x (relative to 1.4.0.0b3)
=======

Breaking Changes
----------------

- CyclesOptions : Removed `cycles:integrator:sampling_pattern` option. This is intended only for debugging, but is still available via a CustomOptions node.

1.4.0.0b3 (relative to 1.4.0.0b2)
=========
Expand Down
24 changes: 0 additions & 24 deletions python/GafferCyclesUI/CyclesOptionsUI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,6 @@ def __samplingSummary( plug ) :
if plug["samples"]["enabled"].getValue() :
info.append( "Samples {}".format( plug["samples"]["value"].getValue() ) )

if plug["samplingPattern"]["enabled"].getValue() :
info.append( "Sampling Pattern {}".format( Gaffer.NodeAlgo.currentPreset( plug["samplingPattern"]["value"] ) ) )

if plug["lightSamplingThreshold"]["enabled"].getValue() :
info.append( "Light Sampling Threshold {}".format( plug["lightSamplingThreshold"]["value"].getValue() ) )

Expand Down Expand Up @@ -680,27 +677,6 @@ def __registerDevicePresets() :

],

"options.samplingPattern" : [

"description",
"""
Random sampling pattern used by the integrator.
""",

"layout:section", "Sampling",

],

"options.samplingPattern.value" : [

"preset:Sobol", "sobol",
"preset:Correlated Multi-Jitter", "cmj",
"preset:Progressive Multi-Jitter", "pmj",

"plugValueWidget:type", "GafferUI.PresetsPlugValueWidget",

],

"options.lightSamplingThreshold" : [

"description",
Expand Down
3 changes: 0 additions & 3 deletions src/GafferCycles/CyclesOptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,6 @@ CyclesOptions::CyclesOptions( const std::string &name )
options->addChild( new Gaffer::NameValuePlug( "cycles:integrator:use_adaptive_sampling", new IECore::BoolData( false ), false, "useAdaptiveSampling" ) );
options->addChild( new Gaffer::NameValuePlug( "cycles:integrator:adaptive_threshold", new IECore::FloatData( 0.0f ), false, "adaptiveThreshold" ) );
options->addChild( new Gaffer::NameValuePlug( "cycles:integrator:adaptive_min_samples", new IECore::IntData( 0 ), false, "adaptiveMinSamples" ) );

options->addChild( new Gaffer::NameValuePlug( "cycles:integrator:sampling_pattern", new IECore::StringData( "sobol" ), false, "samplingPattern" ) );

options->addChild( new Gaffer::NameValuePlug( "cycles:integrator:denoiser_type", new IECore::StringData( "openimagedenoise" ), false, "denoiserType" ) );
options->addChild( new Gaffer::NameValuePlug( "cycles:integrator:denoise_start_sample", new IECore::IntData( 0 ), false, "denoiseStartSample" ) );
options->addChild( new Gaffer::NameValuePlug( "cycles:integrator:use_denoise_pass_albedo", new IECore::BoolData( true ), false, "useDenoisePassAlbedo" ) );
Expand Down
Loading