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

[Bastien Montagne]

Commit: c8de666cbe95403b4e902f10007ef94ec1808c04
Author: Bastien Montagne
Date:   Tue Oct 31 17:38:53 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBc8de666cbe95403b4e902f10007ef94ec1808c04

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/makesrna/intern/rna_render.c
index 5ab4488b1b7,d3b3ed51981..7c5d710c454
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@@ -33,9 -33,8 +33,10 @@@
  #include "BLI_utildefines.h"
  #include "BLI_path_util.h"
  
 +#include "DEG_depsgraph.h"
 +
  #include "BKE_scene.h"
+ #include "BKE_image.h"
  
  #include "RNA_define.h"
  #include "RNA_enum_types.h"