[Bf-blender-cvs] [2ecaebf965] temp-cycles-denoising: Cycles Denoising: Make naming of the options more consistent
Lukas Stockner
noreply at git.blender.org
Fri Mar 24 20:18:52 CET 2017
Commit: 2ecaebf9656884f1fd770edee95237d907e8addb
Author: Lukas Stockner
Date: Fri Mar 24 18:39:30 2017 +0100
Branches: temp-cycles-denoising
https://developer.blender.org/rB2ecaebf9656884f1fd770edee95237d907e8addb
Cycles Denoising: Make naming of the options more consistent
Used to be a mess of denoising_, denoise_ and filter_, now all start with denoising_.
===================================================================
M intern/cycles/blender/addon/ui.py
M intern/cycles/blender/blender_session.cpp
M intern/cycles/render/buffers.cpp
M intern/cycles/render/buffers.h
M intern/cycles/render/session.cpp
M intern/cycles/render/session.h
M intern/cycles/render/tile.cpp
M intern/cycles/render/tile.h
M source/blender/blenkernel/intern/scene.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 1557115d3e..fcad7615ff 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -583,7 +583,7 @@ class CyclesRender_PT_denoising(CyclesButtonsPanel, Panel):
def draw_header(self, context):
rd = context.scene.render
rl = rd.layers.active
- self.layout.prop(rl, "denoise_result", text="")
+ self.layout.prop(rl, "use_denoising", text="")
def draw(self, context):
layout = self.layout
@@ -595,23 +595,23 @@ class CyclesRender_PT_denoising(CyclesButtonsPanel, Panel):
col = layout.column()
sub = col.column(align=True)
- sub.prop(rl, "radius")
- sub.prop(rl, "filter_strength", slider=True)
- sub.prop(rl, "filter_weighting_adjust", slider=True)
- sub.prop(rl, "filter_gradients")
- sub.prop(rl, "filter_cross")
+ sub.prop(rl, "denoising_radius")
+ sub.prop(rl, "denoising_strength", slider=True)
+ sub.prop(rl, "denoising_weighting_adjust", slider=True)
+ sub.prop(rl, "denoising_gradients")
+ sub.prop(rl, "denoising_cross")
sub = col.column(align=True)
row = sub.row(align=True)
- row.prop(rl, "denoise_diffuse_direct", toggle=True)
- row.prop(rl, "denoise_glossy_direct", toggle=True)
- row.prop(rl, "denoise_transmission_direct", toggle=True)
- row.prop(rl, "denoise_subsurface_direct", toggle=True)
+ row.prop(rl, "denoising_diffuse_direct", toggle=True)
+ row.prop(rl, "denoising_glossy_direct", toggle=True)
+ row.prop(rl, "denoising_transmission_direct", toggle=True)
+ row.prop(rl, "denoising_subsurface_direct", toggle=True)
row = sub.row(align=True)
- row.prop(rl, "denoise_diffuse_indirect", toggle=True)
- row.prop(rl, "denoise_glossy_indirect", toggle=True)
- row.prop(rl, "denoise_transmission_indirect", toggle=True)
- row.prop(rl, "denoise_subsurface_indirect", toggle=True)
+ row.prop(rl, "denoising_diffuse_indirect", toggle=True)
+ row.prop(rl, "denoising_glossy_indirect", toggle=True)
+ row.prop(rl, "denoising_transmission_indirect", toggle=True)
+ row.prop(rl, "denoising_subsurface_indirect", toggle=True)
class Cycles_PT_post_processing(CyclesButtonsPanel, Panel):
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 2f3d0ff316..a0732f58be 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -503,28 +503,28 @@ void BlenderSession::render()
}
buffer_params.passes = passes;
- buffer_params.denoising_data_pass = b_layer_iter->denoise_result();
- session->tile_manager.schedule_denoising = b_layer_iter->denoise_result();
- session->params.denoise_result = b_layer_iter->denoise_result();
+ buffer_params.denoising_data_pass = b_layer_iter->use_denoising();
+ session->tile_manager.schedule_denoising = b_layer_iter->use_denoising();
+ session->params.use_denoising = b_layer_iter->use_denoising();
scene->film->denoising_data_pass = buffer_params.denoising_data_pass;
scene->film->denoising_flags = 0;
- if(!b_layer_iter->denoise_diffuse_direct()) scene->film->denoising_flags |= DENOISING_CLEAN_DIFFUSE_DIR;
- if(!b_layer_iter->denoise_diffuse_indirect()) scene->film->denoising_flags |= DENOISING_CLEAN_DIFFUSE_IND;
- if(!b_layer_iter->denoise_glossy_direct()) scene->film->denoising_flags |= DENOISING_CLEAN_GLOSSY_DIR;
- if(!b_layer_iter->denoise_glossy_indirect()) scene->film->denoising_flags |= DENOISING_CLEAN_GLOSSY_IND;
- if(!b_layer_iter->denoise_transmission_direct()) scene->film->denoising_flags |= DENOISING_CLEAN_TRANSMISSION_DIR;
- if(!b_layer_iter->denoise_transmission_indirect()) scene->film->denoising_flags |= DENOISING_CLEAN_TRANSMISSION_IND;
- if(!b_layer_iter->denoise_subsurface_direct()) scene->film->denoising_flags |= DENOISING_CLEAN_SUBSURFACE_DIR;
- if(!b_layer_iter->denoise_subsurface_indirect()) scene->film->denoising_flags |= DENOISING_CLEAN_SUBSURFACE_IND;
+ if(!b_layer_iter->denoising_diffuse_direct()) scene->film->denoising_flags |= DENOISING_CLEAN_DIFFUSE_DIR;
+ if(!b_layer_iter->denoising_diffuse_indirect()) scene->film->denoising_flags |= DENOISING_CLEAN_DIFFUSE_IND;
+ if(!b_layer_iter->denoising_glossy_direct()) scene->film->denoising_flags |= DENOISING_CLEAN_GLOSSY_DIR;
+ if(!b_layer_iter->denoising_glossy_indirect()) scene->film->denoising_flags |= DENOISING_CLEAN_GLOSSY_IND;
+ if(!b_layer_iter->denoising_transmission_direct()) scene->film->denoising_flags |= DENOISING_CLEAN_TRANSMISSION_DIR;
+ if(!b_layer_iter->denoising_transmission_indirect()) scene->film->denoising_flags |= DENOISING_CLEAN_TRANSMISSION_IND;
+ if(!b_layer_iter->denoising_subsurface_direct()) scene->film->denoising_flags |= DENOISING_CLEAN_SUBSURFACE_DIR;
+ if(!b_layer_iter->denoising_subsurface_indirect()) scene->film->denoising_flags |= DENOISING_CLEAN_SUBSURFACE_IND;
scene->film->denoising_clean_pass = (scene->film->denoising_flags & DENOISING_CLEAN_ALL_PASSES);
- scene->film->denoising_split_pass = b_layer_iter->filter_cross();
+ scene->film->denoising_split_pass = b_layer_iter->denoising_cross();
buffer_params.denoising_clean_pass = scene->film->denoising_clean_pass;
buffer_params.denoising_split_pass = scene->film->denoising_split_pass;
session->params.denoising_radius = b_layer_iter->denoising_radius();
- session->params.denoising_pca_threshold = (b_layer_iter->filter_strength() == 0.0f)? 1e-3f : copysignf(powf(10.0f, -fabsf(b_layer_iter->filter_strength())*2.0f), b_layer_iter->filter_strength());
- session->params.denoising_weight_adjust = powf(2.0f, b_layer_iter->filter_weighting_adjust() - 1.0f);
- session->params.denoising_use_gradients = b_layer_iter->filter_gradients();
- session->params.denoising_use_cross = b_layer_iter->filter_cross();
+ session->params.denoising_pca_threshold = (b_layer_iter->denoising_strength() == 0.0f)? 1e-3f : copysignf(powf(10.0f, -fabsf(b_layer_iter->denoising_strength())*2.0f), b_layer_iter->denoising_strength());
+ session->params.denoising_weight_adjust = powf(2.0f, b_layer_iter->denoising_weighting_adjust() - 1.0f);
+ session->params.denoising_use_gradients = b_layer_iter->denoising_gradients();
+ session->params.denoising_use_cross = b_layer_iter->denoising_cross();
scene->film->pass_alpha_threshold = b_layer_iter->pass_alpha_threshold();
scene->film->tag_passes_update(scene, passes);
diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp
index b73f8d9b7d..67461cccf0 100644
--- a/intern/cycles/render/buffers.cpp
+++ b/intern/cycles/render/buffers.cpp
@@ -84,7 +84,7 @@ int BufferParams::get_passes_size()
return align_up(size, 4);
}
-int BufferParams::get_denoise_offset()
+int BufferParams::get_denoising_offset()
{
int offset = 0;
diff --git a/intern/cycles/render/buffers.h b/intern/cycles/render/buffers.h
index 0c636fc989..e415b822f7 100644
--- a/intern/cycles/render/buffers.h
+++ b/intern/cycles/render/buffers.h
@@ -64,7 +64,7 @@ public:
bool modified(const BufferParams& params);
void add_pass(PassType type);
int get_passes_size();
- int get_denoise_offset();
+ int get_denoising_offset();
};
/* Render Buffers */
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 85623fcef2..507cac1b16 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -964,7 +964,7 @@ void Session::render()
task.requested_tile_size = params.tile_size;
task.passes_size = tile_manager.params.get_passes_size();
- if(params.denoise_result) {
+ if(params.use_denoising) {
task.denoising_radius = params.denoising_radius;
task.denoising_pca_threshold = params.denoising_pca_threshold;
task.denoising_weight_adjust = params.denoising_weight_adjust;
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h
index 622cd45e79..1d80e804fc 100644
--- a/intern/cycles/render/session.h
+++ b/intern/cycles/render/session.h
@@ -55,10 +55,9 @@ public:
int start_resolution;
int threads;
- bool denoise_result;
-
bool display_buffer_linear;
+ bool use_denoising;
int denoising_radius;
float denoising_pca_threshold;
float denoising_weight_adjust;
@@ -86,7 +85,7 @@ public:
start_resolution = INT_MAX;
threads = 0;
- denoise_result = false;
+ use_denoising = false;
display_buffer_linear = false;
@@ -116,7 +115,7 @@ public:
&& tile_size == params.tile_size
&& start_resolution == params.start_resolution
&& threads == params.threads
- && denoise_result == params.denoise_result
+ && use_denoising == params.use_denoising
&& denoising_radius == params.denoising_radius
&& denoising_pca_threshold == params.denoising_pca_threshold
&& denoising_weight_adjust == params.denoising_weight_adjust
diff --git a/intern/cycles/render/tile.cpp b/intern/cycles/render/tile.cpp
index 26ea54759f..daa7811938 100644
--- a/intern/cycles/render/tile.cpp
+++ b/intern/cycles/render/tile.cpp
@@ -149,7 +149,7 @@ void TileManager::reset(BufferParams& params_, int num_samples_)
state.num_samples = 0;
state.resolution_divider = get_divider(params.width, params.height, start_resolution);
state.render_tiles.clear();
- state.denoise_tiles.clear();
+ state.denoising_tiles.clear();
state.tiles.clear();
}
@@ -199,9 +199,9 @@ int TileManager::gen_tiles(bool sliced)
state.tiles.clear();
state.tiles.resize(tile_w*tile_h);
state.render_tiles.clear();
- state.denoise_tiles.clear();
+ state.denoising_tiles.clear();
state.render_tiles.resize(num);
- state.denoise_tiles.resize(num);
+ state.denoising_tiles.resize(num);
state.tile_stride = tile_w;
vector<list<int> >::iterator tile_list;
tile_list = state.render_tiles.begin();
@@ -402,7 +402,7 @@ bool TileManager::return_tile(int index, bool &delete_tile)
}
if(can_be_denoised) {
state.tiles[nindex].state = Tile::DENOISE;
- state.denoise_tiles[state.tiles[nindex].device].push_back(nindex);
+ state.denoising_tiles[state.tiles[nindex].device].push_back(nindex);
}
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list