[Bf-blender-cvs] [e8452cf0bcc] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: e8452cf0bccea0b06a24b370e9ed2331abec3a3c
Author: Campbell Barton
Date:   Thu Jan 18 14:11:38 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBe8452cf0bccea0b06a24b370e9ed2331abec3a3c

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/screen/screen_ops.c
index 4460ac7d1a7,176bdc764a2..39b1f5ff5dd
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@@ -1231,14 -1261,12 +1278,14 @@@ static void area_move_apply_do
  
  	/* only redraw if we actually moved a screen vert, for AREAGRID */
  	if (doredraw) {
- 		for (sa = sc->areabase.first; sa; sa = sa->next) {
- 			if (sa->v1->editflag || sa->v2->editflag || sa->v3->editflag || sa->v4->editflag)
+ 		for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) {
+ 			if (sa->v1->editflag || sa->v2->editflag || sa->v3->editflag || sa->v4->editflag) {
  				ED_area_tag_redraw(sa);
+ 			}
  		}
- 
  		WM_event_add_notifier(C, NC_SCREEN | NA_EDITED, NULL); /* redraw everything */
 +		/* Update preview thumbnail */
 +		BKE_icon_changed(sc->id.icon_id);
  	}
  }
  
diff --cc source/blender/makesdna/DNA_scene_types.h
index 0dc640adb29,1ce94fb226f..4d910588975
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -172,27 -178,30 +172,28 @@@ typedef struct AudioData 
  typedef struct SceneRenderLayer {
  	struct SceneRenderLayer *next, *prev;
  	
 -	char name[64];	/* MAX_NAME */
 +	char name[64] DNA_DEPRECATED;	/* MAX_NAME */
  	
 -	struct Material *mat_override;
 -	struct Group *light_override;
 +	struct Material *mat_override DNA_DEPRECATED; /* Converted to ViewLayer override. */
  	
 -	unsigned int lay;		  /* Scene.lay itself has priority over this */
 -	unsigned int lay_zmask;	  /* has to be after lay, this is for Z-masking */
 -	unsigned int lay_exclude; /* not used by internal, exclude */
 -	int layflag;
 +	unsigned int lay DNA_DEPRECATED; /* Converted to LayerCollection cycles camera visibility override. */
 +	unsigned int lay_zmask DNA_DEPRECATED; /* Converted to LayerCollection cycles holdout override. */
 +	unsigned int lay_exclude DNA_DEPRECATED;
 +	int layflag DNA_DEPRECATED; /* Converted to ViewLayer layflag and flag. */
- 	
+ 
+ 	/* pass_xor has to be after passflag */
 -	/* note, this is treestore element 'nr' in outliner, short still... */
 -	int passflag;
 -	int pass_xor;
 +	int passflag DNA_DEPRECATED; /* pass_xor has to be after passflag */
 +	int pass_xor DNA_DEPRECATED; /* Converted to ViewLayer passflag and flag. */
  
 -	int samples;
 -	float pass_alpha_threshold;
 +	int samples DNA_DEPRECATED; /* Converted to ViewLayer override. */
 +	float pass_alpha_threshold DNA_DEPRECATED; /* Converted to ViewLayer pass_alpha_threshold. */
  
 -	IDProperty *prop;
 +	IDProperty *prop DNA_DEPRECATED; /* Converted to ViewLayer id_properties. */
  
 -	struct FreestyleConfig freestyleConfig;
 +	struct FreestyleConfig freestyleConfig DNA_DEPRECATED; /* Converted to ViewLayer freestyleConfig. */
  } SceneRenderLayer;
  
- /* srl->layflag */
+ /* SceneRenderLayer.layflag */
  #define SCE_LAY_SOLID	1
  #define SCE_LAY_ZTRA	2
  #define SCE_LAY_HALO	4
@@@ -1886,11 -1892,9 +1895,11 @@@ enum 
  
  /* sequencer seq_prev_type seq_rend_type */
  
- /* scene->r.engine (scene.c) */
+ /* RenderData.engine (scene.c) */
  extern const char *RE_engine_id_BLENDER_RENDER;
  extern const char *RE_engine_id_BLENDER_GAME;
 +extern const char *RE_engine_id_BLENDER_CLAY;
 +extern const char *RE_engine_id_BLENDER_EEVEE;
  extern const char *RE_engine_id_CYCLES;
  
  /* **************** SCENE ********************* */