diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-10-27 13:40:42 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-10-27 13:40:42 +0300 |
commit | 30f626fe4cd62f406468ef0ff2169694424b1a29 (patch) | |
tree | d428586cd3a6e689ab1e2f5a4222d1e0eb77ada7 /intern/cycles/render/integrator.h | |
parent | 17381c7b90eb3acde53eca013ae5a5a55699f17d (diff) |
Revert "Cycles API: encapsulate Node socket members"
This reverts commit 527f8b32b32187f754e5b176db6377736f9cb8ff. It is causing
motion blur test failures and crashes in some renders, reverting until this is
fixed.
Diffstat (limited to 'intern/cycles/render/integrator.h')
-rw-r--r-- | intern/cycles/render/integrator.h | 71 |
1 files changed, 37 insertions, 34 deletions
diff --git a/intern/cycles/render/integrator.h b/intern/cycles/render/integrator.h index 9fe46ad591c..9804caebe6e 100644 --- a/intern/cycles/render/integrator.h +++ b/intern/cycles/render/integrator.h @@ -31,52 +31,52 @@ class Integrator : public Node { public: NODE_DECLARE - NODE_SOCKET_API(int, min_bounce) - NODE_SOCKET_API(int, max_bounce) + int min_bounce; + int max_bounce; - NODE_SOCKET_API(int, max_diffuse_bounce) - NODE_SOCKET_API(int, max_glossy_bounce) - NODE_SOCKET_API(int, max_transmission_bounce) - NODE_SOCKET_API(int, max_volume_bounce) + int max_diffuse_bounce; + int max_glossy_bounce; + int max_transmission_bounce; + int max_volume_bounce; - NODE_SOCKET_API(int, transparent_min_bounce) - NODE_SOCKET_API(int, transparent_max_bounce) + int transparent_min_bounce; + int transparent_max_bounce; - NODE_SOCKET_API(int, ao_bounces) + int ao_bounces; - NODE_SOCKET_API(int, volume_max_steps) - NODE_SOCKET_API(float, volume_step_rate) + int volume_max_steps; + float volume_step_rate; - NODE_SOCKET_API(bool, caustics_reflective) - NODE_SOCKET_API(bool, caustics_refractive) - NODE_SOCKET_API(float, filter_glossy) + bool caustics_reflective; + bool caustics_refractive; + float filter_glossy; - NODE_SOCKET_API(int, seed) + int seed; - NODE_SOCKET_API(float, sample_clamp_direct) - NODE_SOCKET_API(float, sample_clamp_indirect) - NODE_SOCKET_API(bool, motion_blur) + float sample_clamp_direct; + float sample_clamp_indirect; + bool motion_blur; /* Maximum number of samples, beyond which we are likely to run into * precision issues for sampling patterns. */ static const int MAX_SAMPLES = (1 << 24); - NODE_SOCKET_API(int, aa_samples) - NODE_SOCKET_API(int, diffuse_samples) - NODE_SOCKET_API(int, glossy_samples) - NODE_SOCKET_API(int, transmission_samples) - NODE_SOCKET_API(int, ao_samples) - NODE_SOCKET_API(int, mesh_light_samples) - NODE_SOCKET_API(int, subsurface_samples) - NODE_SOCKET_API(int, volume_samples) - NODE_SOCKET_API(int, start_sample) + int aa_samples; + int diffuse_samples; + int glossy_samples; + int transmission_samples; + int ao_samples; + int mesh_light_samples; + int subsurface_samples; + int volume_samples; + int start_sample; - NODE_SOCKET_API(bool, sample_all_lights_direct) - NODE_SOCKET_API(bool, sample_all_lights_indirect) - NODE_SOCKET_API(float, light_sampling_threshold) + bool sample_all_lights_direct; + bool sample_all_lights_indirect; + float light_sampling_threshold; - NODE_SOCKET_API(int, adaptive_min_samples) - NODE_SOCKET_API(float, adaptive_threshold) + int adaptive_min_samples; + float adaptive_threshold; enum Method { BRANCHED_PATH = 0, @@ -85,9 +85,11 @@ class Integrator : public Node { NUM_METHODS, }; - NODE_SOCKET_API(Method, method) + Method method; - NODE_SOCKET_API(SamplingPattern, sampling_pattern) + SamplingPattern sampling_pattern; + + bool need_update; Integrator(); ~Integrator(); @@ -95,6 +97,7 @@ class Integrator : public Node { void device_update(Device *device, DeviceScene *dscene, Scene *scene); void device_free(Device *device, DeviceScene *dscene); + bool modified(const Integrator &integrator); void tag_update(Scene *scene); }; |