[Bf-blender-cvs] [2ff3767574] soc-2016-cycles_denoising: Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising

[Lukas Stockner]

Commit: 2ff37675744ef3634b0dc0bd3821e98a7bd53086
Author: Lukas Stockner
Date:   Thu Feb 9 14:27:02 2017 +0100
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rB2ff37675744ef3634b0dc0bd3821e98a7bd53086

Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising

Conflicts:
	source/blender/blenloader/intern/writefile.c

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index 5794c99c1b,f467010f08..7fd81e5f9e
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -2814,15 -2712,12 +2712,15 @@@ static void write_scenes(WriteData *wd
  			writestruct(wd, DATA, TransformOrientation, 1, ts);
  		}
  
- 		for (srl = sce->r.layers.first; srl; srl = srl->next) {
+ 		for (SceneRenderLayer *srl = sce->r.layers.first; srl; srl = srl->next) {
  			writestruct(wd, DATA, SceneRenderLayer, 1, srl);
 +			if (srl->prop) {
 +				IDP_WriteProperty(srl->prop, wd);
 +			}
- 			for (fmc = srl->freestyleConfig.modules.first; fmc; fmc = fmc->next) {
+ 			for (FreestyleModuleConfig *fmc = srl->freestyleConfig.modules.first; fmc; fmc = fmc->next) {
  				writestruct(wd, DATA, FreestyleModuleConfig, 1, fmc);
  			}
- 			for (fls = srl->freestyleConfig.linesets.first; fls; fls = fls->next) {
+ 			for (FreestyleLineSet *fls = srl->freestyleConfig.linesets.first; fls; fls = fls->next) {
  				writestruct(wd, DATA, FreestyleLineSet, 1, fls);
  			}
  		}