[Bf-blender-cvs] [647f561] soc-2016-cycles_denoising: Merge branch 'master' into soc-2016-cycles_denoising

[Lukas Stockner]

Commit: 647f561a628a5d83942b38efc2e22aff9829892f
Author: Lukas Stockner
Date:   Mon Sep 5 04:03:42 2016 +0200
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rB647f561a628a5d83942b38efc2e22aff9829892f

Merge branch 'master' into soc-2016-cycles_denoising

===================================================================



===================================================================

diff --cc source/blender/blenloader/intern/versioning_270.c
index 7a5f54f,dfaa59c..2d5d688
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1338,25 -1347,8 +1347,25 @@@ void blo_do_versions_270(FileData *fd, 
  		}
  		/* ------- end of grease pencil initialization --------------- */
  	}
 +	
 +	{
 +		if (!DNA_struct_elem_find(fd->filesdna, "SceneRenderLayer", "int", "denoiseflag")) {
 +			Scene *sce;
 +
 +			for (sce = main->scene.first; sce; sce = sce->id.next) {
 +				SceneRenderLayer *rl;
 +				for (rl = sce->r.layers.first; rl; rl = rl->next) {
 +					rl->denoiseflag = SCE_DENOISE_DIFFDIR|SCE_DENOISE_GLOSSDIR|SCE_DENOISE_TRANSDIR|SCE_DENOISE_SUBDIR|
 +					                  SCE_DENOISE_DIFFIND|SCE_DENOISE_GLOSSIND|SCE_DENOISE_TRANSIND|SCE_DENOISE_SUBIND;
 +					rl->denoise_half_window = 8;
 +					rl->denoise_strength = 0.0f;
 +				}
 +			}
 +		}
 +	}
 +
  
- 	{
+ 	if (!MAIN_VERSION_ATLEAST(main, 278, 0)) {
  		if (!DNA_struct_elem_find(fd->filesdna, "MovieTrackingTrack", "float", "weight_stab")) {
  			MovieClip *clip;
  			for (clip = main->movieclip.first; clip; clip = clip->id.next) {