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

[Clément Foucault]

Commit: d73bdecea48f666b0d3b9c352fd9cb623d683eda
Author: Clément Foucault
Date:   Fri Jun 22 20:20:38 2018 +0200
Branches: temp-eeveelightcache
https://developer.blender.org/rBd73bdecea48f666b0d3b9c352fd9cb623d683eda

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

# Conflicts:
#	source/blender/blenloader/intern/versioning_280.c

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 122405a9067,08b1e47cbaa..846f1f60ff2
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -1526,11 -1526,10 +1526,17 @@@ void blo_do_versions_280(FileData *fd, 
  			}
  		}
  
 +		if (!DNA_struct_elem_find(fd->filesdna, "SceneEEVEE", "float", "gi_cubemap_draw_size")) {
 +			for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 +				scene->eevee.gi_irradiance_draw_size = 0.2f;
 +				scene->eevee.gi_cubemap_draw_size = 1.0f;
 +			}
 +		}
++
+ 		for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
+ 			if (scene->toolsettings->manipulator_flag == 0) {
+ 				scene->toolsettings->manipulator_flag = SCE_MANIP_TRANSLATE | SCE_MANIP_ROTATE | SCE_MANIP_SCALE;
+ 			}
+ 		}
  	}
  }