diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2017-04-24 23:15:09 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2017-04-24 23:15:09 +0300 |
| commit | e1f5b6bdcb20f5a58b1049761aa07971d2c69346 (patch) | |
| tree | 2b4ea99bbf3df4da6a05e2db257426cbdc6d393f /source | |
| parent | 14f393f2ced4127645647cc478a30e1e10ceada8 (diff) | |
Cycles Denoising: Merge all the changes from the version that's being reviewed
No functional changes.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_270.c | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index aba792879ff..5abbee7e6fc 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -1404,7 +1404,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main) } /* ------- end of grease pencil initialization --------------- */ } - + { if (!DNA_struct_elem_find(fd->filesdna, "SceneRenderLayer", "int", "denoising_flag")) { Scene *sce; @@ -1413,7 +1413,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main) SceneRenderLayer *rl; for (rl = sce->r.layers.first; rl; rl = rl->next) { rl->denoising_flag = SCE_DENOISING_PASS_DIFFDIR|SCE_DENOISING_PASS_GLOSSDIR|SCE_DENOISING_PASS_TRANSDIR|SCE_DENOISING_PASS_SUBDIR| - SCE_DENOISING_PASS_DIFFIND|SCE_DENOISING_PASS_GLOSSIND|SCE_DENOISING_PASS_TRANSIND|SCE_DENOISING_PASS_SUBIND; + SCE_DENOISING_PASS_DIFFIND|SCE_DENOISING_PASS_GLOSSIND|SCE_DENOISING_PASS_TRANSIND|SCE_DENOISING_PASS_SUBIND; rl->denoising_radius = 8; } } diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 47df1f9fbde..6f9545da064 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -234,7 +234,7 @@ typedef struct SceneRenderLayer { int samples; float pass_alpha_threshold; - + struct FreestyleConfig freestyleConfig; } SceneRenderLayer; |