Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 7 May 2018 15:54:10 +0000 (17:54 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 7 May 2018 15:54:10 +0000 (17:54 +0200)
1  2 
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_image.c

index 6db8ee8bde1f13a5f3fe8ffe311d28ebf8d42b2e,5bb38f2930947bdf24b400b97108cc77e1eff4e0..4ed035c4e8697848d9d4300a38d89041abd70454
  #include "DNA_scene_types.h"
  
  #include "BLI_utildefines.h"
+ #include "BLI_math_base.h"
  
  #include "BKE_context.h"
 -#include "BKE_depsgraph.h"
  #include "BKE_image.h"
  
 +#include "DEG_depsgraph.h"
 +
  #include "RNA_access.h"
  #include "RNA_define.h"
  #include "RNA_enum_types.h"