[Bf-blender-cvs] [7538716d570] temp-eeveelightcache: Merge remote-tracking branch 'origin/blender2.8' into temp-eeveelightcache

[Clément Foucault]

Commit: 7538716d570b73c2e113f318db8ce54f507bf52b
Author: Clément Foucault
Date:   Fri Jul 6 14:50:54 2018 +0200
Branches: temp-eeveelightcache
https://developer.blender.org/rB7538716d570b73c2e113f318db8ce54f507bf52b

Merge remote-tracking branch 'origin/blender2.8' into temp-eeveelightcache

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



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

diff --cc source/blender/draw/engines/eevee/eevee_private.h
index 62d0c979755,c2f9d16361d..b71165fbd8c
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@@ -97,13 -94,9 +97,13 @@@ extern struct DrawEngineType draw_engin
  
  #define OVERLAY_ENABLED(v3d) ((v3d) && (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0)
  #define LOOK_DEV_MODE_ENABLED(v3d) ((v3d) && (v3d->drawtype == OB_MATERIAL))
- #define LOOK_DEV_OVERLAY_ENABLED(v3d) (LOOK_DEV_MODE_ENABLED(v3d) && OVERLAY_ENABLED(v3d) && ((v3d->overlay.flag & V3D_OVERLAY_LOOK_DEV) > 0))
+ #define LOOK_DEV_OVERLAY_ENABLED(v3d) (LOOK_DEV_MODE_ENABLED(v3d) && OVERLAY_ENABLED(v3d) && (v3d->overlay.flag & V3D_OVERLAY_LOOK_DEV))
  #define USE_SCENE_LIGHT(v3d) ((!v3d) || (!LOOK_DEV_MODE_ENABLED(v3d)) || ((LOOK_DEV_MODE_ENABLED(v3d) && (v3d->shading.flag & V3D_SHADING_SCENE_LIGHT))))
  
 +#define OCTAHEDRAL_SIZE_FROM_CUBESIZE(cube_size) ((int)ceilf(sqrtf((cube_size * cube_size) * 6.0f)))
 +#define MIN_CUBE_LOD_LEVEL 3
 +#define MAX_PLANAR_LOD_LEVEL 9
 +
  /* World shader variations */
  enum {
  	VAR_WORLD_BACKGROUND    = 0,