Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorLukas Stockner <lukas.stockner@freenet.de>2017-03-24 18:31:57 +0300
committerLukas Stockner <lukas.stockner@freenet.de>2017-03-24 18:46:16 +0300
commitf8bb5aac2627403aac3b068902315995a5f4ba41 (patch)
tree6b44ecfd47b9abd7ebc5f98ef580ddddb699a902 /source
parent394f0391cc45b1b43f569a040ab4064978e35b3b (diff)
Cycles Denoising: Rename half window to radius
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/scene.c2
-rw-r--r--source/blender/blenloader/intern/versioning_270.c2
-rw-r--r--source/blender/makesdna/DNA_scene_types.h2
-rw-r--r--source/blender/makesrna/intern/rna_scene.c6
4 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 9aeca3fbaf2..08804fb980e 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2043,7 +2043,7 @@ SceneRenderLayer *BKE_scene_add_render_layer(Scene *sce, const char *name)
srl->pass_alpha_threshold = 0.5f;
srl->denoiseflag = SCE_DENOISE_PASS_DIFFDIR|SCE_DENOISE_PASS_GLOSSDIR|SCE_DENOISE_PASS_TRANSDIR|SCE_DENOISE_PASS_SUBDIR|
SCE_DENOISE_PASS_DIFFIND|SCE_DENOISE_PASS_GLOSSIND|SCE_DENOISE_PASS_TRANSIND|SCE_DENOISE_PASS_SUBIND;
- srl->denoise_half_window = 8;
+ srl->denoising_radius = 8;
srl->denoise_strength = 0.0f;
BKE_freestyle_config_init(&srl->freestyleConfig);
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 07edbd85d27..55ddcb5e612 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1414,7 +1414,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
for (rl = sce->r.layers.first; rl; rl = rl->next) {
rl->denoiseflag = SCE_DENOISE_PASS_DIFFDIR|SCE_DENOISE_PASS_GLOSSDIR|SCE_DENOISE_PASS_TRANSDIR|SCE_DENOISE_PASS_SUBDIR|
SCE_DENOISE_PASS_DIFFIND|SCE_DENOISE_PASS_GLOSSIND|SCE_DENOISE_PASS_TRANSIND|SCE_DENOISE_PASS_SUBIND;
- rl->denoise_half_window = 8;
+ rl->denoising_radius = 8;
rl->denoise_strength = 0.0f;
}
}
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 2e9f53c6109..5569dc823bd 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -228,7 +228,7 @@ typedef struct SceneRenderLayer {
int pass_xor;
int denoiseflag;
- int denoise_half_window;
+ int denoising_radius;
float denoise_strength;
float denoise_weighting;
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 5f578ad2c0b..5443c56fe95 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -5147,10 +5147,10 @@ static void rna_def_scene_render_layer(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Filter weighting adjust", "Controls neighbor pixel weighting for the denoising filter (lower values preserve more detail, but aren't as smooth)");
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
- prop = RNA_def_property(srna, "half_window", PROP_INT, PROP_NONE);
- RNA_def_property_int_sdna(prop, NULL, "denoise_half_window");
+ prop = RNA_def_property(srna, "denoising_radius", PROP_INT, PROP_NONE);
+ RNA_def_property_int_sdna(prop, NULL, "denoising_radius");
RNA_def_property_range(prop, 1, 50);
- RNA_def_property_ui_text(prop, "Half window", "Size of the filter window (the pixel area used for denoising one pixel). Higher values get rid of more noise, but might lose detail and are slower");
+ RNA_def_property_ui_text(prop, "Denoising Radius", "Size of the image area that's used to denoise a pixel. Higher values get rid of more noise, but might lose detail and are slower");
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
prop = RNA_def_property(srna, "filter_gradients", PROP_BOOLEAN, PROP_NONE);