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

[Clément Foucault]

Commit: 93aca278d2f38697c054c9807fd19d7c6e6bd812
Author: Clément Foucault
Date:   Mon Jun 25 18:32:30 2018 +0200
Branches: temp-eeveelightcache
https://developer.blender.org/rB93aca278d2f38697c054c9807fd19d7c6e6bd812

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

# Conflicts:
#	source/blender/draw/engines/eevee/eevee_render.c

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



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

diff --cc source/blender/draw/engines/eevee/eevee_render.c
index 7146bc5b379,c650a6945ac..b485bb9d737
--- a/source/blender/draw/engines/eevee/eevee_render.c
+++ b/source/blender/draw/engines/eevee/eevee_render.c
@@@ -140,26 -139,13 +140,26 @@@ void EEVEE_render_cache
          struct RenderEngine *engine, struct Depsgraph *UNUSED(depsgraph))
  {
  	EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_ensure();
 -
 -	char info[42];
 -	BLI_snprintf(info, sizeof(info), "Syncing %s", ob->id.name + 2);
 -	RE_engine_update_stats(engine, NULL, info);
 +	EEVEE_LightProbesInfo *pinfo = sldata->probes;
  	bool cast_shadow = false;
  
 +	if (pinfo->vis_data.collection) {
 +		/* Used for rendering probe with visibility groups. */
 +		bool ob_vis = BKE_collection_has_object_recursive(pinfo->vis_data.collection, ob);
 +		ob_vis = (pinfo->vis_data.invert) ? !ob_vis : ob_vis;
 +
 +		if (!ob_vis) {
 +			return;
 +		}
 +	}
 +
 +	if (engine) {
 +		char info[42];
 +		BLI_snprintf(info, sizeof(info), "Syncing %s", ob->id.name + 2);
 +		RE_engine_update_stats(engine, NULL, info);
 +	}
 +
- 	if (ob->base_flag & BASE_VISIBLED) {
+ 	if (ob->base_flag & BASE_VISIBLE) {
  		EEVEE_hair_cache_populate(vedata, sldata, ob, &cast_shadow);
  	}