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

Campbell Barton noreply at git.blender.org
Mon May 7 17:57:11 CEST 2018


Commit: f62b826533422e5de3b08601e5511c233deda529
Author: Campbell Barton
Date:   Mon May 7 17:54:10 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf62b826533422e5de3b08601e5511c233deda529

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/makesrna/intern/rna_image.c
index 6db8ee8bde1,5bb38f29309..4ed035c4e86
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@@ -30,12 -30,12 +30,13 @@@
  #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"



More information about the Bf-blender-cvs mailing list