[Bf-blender-cvs] [d955781] multi_previews_id: Merge branch 'master' into multi_previews_id

[Bastien Montagne]

Commit: d955781fe0646a64645abd32217d50a346d35b05
Author: Bastien Montagne
Date:   Mon Nov 14 15:49:03 2016 +0100
Branches: multi_previews_id
https://developer.blender.org/rBd955781fe0646a64645abd32217d50a346d35b05

Merge branch 'master' into multi_previews_id

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



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

diff --cc source/blender/makesrna/intern/rna_ID.c
index be1537b,5174c95..082836b
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@@ -35,10 -35,8 +35,11 @@@
  #include "BLI_utildefines.h"
  
  #include "BKE_icons.h"
 +#include "BKE_image.h"
+ #include "BKE_object.h"
  
 +#include "IMB_imbuf_types.h"
 +
  #include "RNA_access.h"
  #include "RNA_define.h"
  #include "RNA_enum_types.h"