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

[Sybren A. Stüvel]

Commit: 3bca9f5fed1f6d3dd485e3cff2174c3394bb1162
Author: Sybren A. Stüvel
Date:   Tue Aug 15 13:02:45 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB3bca9f5fed1f6d3dd485e3cff2174c3394bb1162

Merge branch 'master' into blender2.8

# Conflicts:
#	source/blender/makesrna/intern/rna_render.c

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



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

diff --cc source/blender/makesrna/intern/rna_render.c
index 725aa785332,a66c160ed1a..7bcf116d6b7
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@@ -33,8 -33,8 +33,10 @@@
  #include "BLI_utildefines.h"
  #include "BLI_path_util.h"
  
 +#include "DEG_depsgraph.h"
 +
+ #include "BKE_scene.h"
+ 
  #include "RNA_define.h"
  #include "RNA_enum_types.h"
  
diff --cc source/blender/makesrna/intern/rna_scene.c
index b9ab2968e06,71350edeb94..2975c318d66
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -1885,6 -1846,13 +1885,13 @@@ static void rna_Scene_simplify_update(M
  		rna_Scene_use_simplify_update(bmain, sce, ptr);
  }
  
+ static void rna_SceneRenderData_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
+ {
+ 	Scene *sce = ptr->id.data;
+ 
 -	DAG_id_tag_update(&sce->id, 0);
++	DEG_id_tag_update(&sce->id, 0);
+ }
+ 
  static void rna_Scene_use_persistent_data_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
  {
  	Scene *sce = ptr->id.data;