Commit: cdc817d19142415c002a395f7ffcdca3b27cf556
Author: Sergey Sharybin
Date: Tue Aug 31 10:35:13 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBcdc817d19142415c002a395f7ffcdca3b27cf556
Cleanup: Member naming in Cycles X
===================================================================
M intern/cycles/integrator/path_trace.cpp
M intern/cycles/integrator/path_trace.h
===================================================================
diff --git a/intern/cycles/integrator/path_trace.cpp
b/intern/cycles/integrator/path_trace.cpp
index 4fb1e49a250..a2a591e441c 100644
--- a/intern/cycles/integrator/path_trace.cpp
+++ b/intern/cycles/integrator/path_trace.cpp
@@ -123,7 +123,7 @@ void PathTrace::reset(const BufferParams &big_tile_params)
gpu_display_->reset(big_tile_params);
}
- render_state_.has_denoised_result_ = false;
+ render_state_.has_denoised_result = false;
did_draw_after_reset_ = false;
}
@@ -494,7 +494,7 @@ void PathTrace::denoise(const RenderWork &render_work)
render_scheduler_.report_denoise_time(render_work, time_dt() - start_time);
- render_state_.has_denoised_result_ = true;
+ render_state_.has_denoised_result = true;
}
void PathTrace::set_gpu_display(unique_ptr<GPUDisplay> gpu_display)
@@ -550,8 +550,8 @@ void PathTrace::update_display(const RenderWork
&render_work)
return;
}
- const PassMode pass_mode = render_state_.has_denoised_result_ ?
PassMode::DENOISED :
-
PassMode::NOISY;
+ const PassMode pass_mode = render_state_.has_denoised_result ?
PassMode::DENOISED :
+
PassMode::NOISY;
/* TODO(sergey): When using multi-device rendering map the GPUDisplay once
and copy data from all
* works in parallel. */
@@ -755,7 +755,7 @@ bool PathTrace::set_render_tile_pixels(PassAccessor
&pass_accessor,
bool PathTrace::has_denoised_result() const
{
- return render_state_.has_denoised_result_;
+ return render_state_.has_denoised_result;
}
/* --------------------------------------------------------------------
diff --git a/intern/cycles/integrator/path_trace.h
b/intern/cycles/integrator/path_trace.h
index 0e4f94c0811..441d0469300 100644
--- a/intern/cycles/integrator/path_trace.h
+++ b/intern/cycles/integrator/path_trace.h
@@ -250,7 +250,7 @@ class PathTrace {
BufferParams effective_big_tile_params;
/* Denosier was run and there are denoised versions of the passes in the
render buffers. */
- bool has_denoised_result_ = false;
+ bool has_denoised_result = false;
} render_state_;
/* Progress object which is used to communicate sample progress. */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
