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

[Kévin Dietrich]

Commit: 94eb1897523d4cf464ea0cdf90ccbd7db90f997d
Author: Kévin Dietrich
Date:   Sat Feb 24 14:02:50 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB94eb1897523d4cf464ea0cdf90ccbd7db90f997d

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/BKE_blender_version.h

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 044c47847be,f1c40aae399..bd4e4c2e35c
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1733,29 -1733,26 +1733,47 @@@ void blo_do_versions_270(FileData *fd, 
  		for (Mesh *me = main->mesh.first; me; me = me->id.next) {
  			CustomData_set_layer_name(&me->vdata, CD_MDEFORMVERT, 0, "");
  		}
 +
 +		if (!DNA_struct_elem_find(fd->filesdna, "View3DDebug", "char", "background")) {
 +			bScreen *screen;
 +
 +			for (screen = main->screen.first; screen; screen = screen->id.next) {
 +				ScrArea *sa;
 +				for (sa = screen->areabase.first; sa; sa = sa->next) {
 +					SpaceLink *sl;
 +
 +					for (sl = sa->spacedata.first; sl; sl = sl->next) {
 +						switch (sl->spacetype) {
 +							case SPACE_VIEW3D:
 +							{
 +								View3D *v3d = (View3D *)sl;
 +								v3d->debug.background = V3D_DEBUG_BACKGROUND_NONE;
 +							}
 +						}
 +					}
 +				}
 +			}
 +		}
  	}
  
+ 	if (!MAIN_VERSION_ATLEAST(main, 279, 3)) {
+ 		if (!DNA_struct_elem_find(fd->filesdna, "SmokeDomainSettings", "float", "clipping")) {
+ 			Object *ob;
+ 			ModifierData *md;
+ 
+ 			for (ob = main->object.first; ob; ob = ob->id.next) {
+ 				for (md = ob->modifiers.first; md; md = md->next) {
+ 					if (md->type == eModifierType_Smoke) {
+ 						SmokeModifierData *smd = (SmokeModifierData *)md;
+ 						if (smd->domain) {
+ 							smd->domain->clipping = 1e-3f;
+ 						}
+ 					}
+ 				}
+ 			}
+ 		}
+ 	}
+ 
  	{
  		/* Fix for invalid state of screen due to bug in older versions. */
  		for (bScreen *sc = main->screen.first; sc; sc = sc->id.next) {