[Bf-blender-cvs] [0d4ea39] custom-manipulators: Merge branch 'blender2.8' into custom-manipulators

[Julian Eisel]

Commit: 0d4ea39f957ba983e47165e8729f6aef022368bb
Author: Julian Eisel
Date:   Fri Sep 30 01:28:53 2016 +0200
Branches: custom-manipulators
https://developer.blender.org/rB0d4ea39f957ba983e47165e8729f6aef022368bb

Merge branch 'blender2.8' into custom-manipulators

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 5476281,eb39892..6259012
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1317,44 -1318,23 +1318,62 @@@ void blo_do_versions_270(FileData *fd, 
  				scene->r.ffcodecdata.constant_rate_factor = FFM_CRF_NONE;
  			}
  		}
+ 
+ 		if (!DNA_struct_elem_find(fd->filesdna, "SmokeModifierData", "float", "slice_per_voxel")) {
+ 			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->slice_per_voxel = 5.0f;
+ 							smd->domain->slice_depth = 0.5f;
+ 							smd->domain->display_thickness = 1.0f;
+ 						}
+ 					}
+ 				}
+ 			}
+ 		}
  	}
 +
 +	{
 +		if (!DNA_struct_elem_find(fd->filesdna, "SpaceNode", "float", "backdrop_zoom")) {
 +			bScreen *sc;
 +			for (sc = main->screen.first; sc; sc = sc->id.next) {
 +				ScrArea *sa;
 +				for (sa = sc->areabase.first; sa; sa = sa->next) {
 +					SpaceLink *sl;
 +					for (sl = sa->spacedata.first; sl; sl = sl->next) {
 +						if (sl->spacetype == SPACE_NODE) {
 +							SpaceNode *snode = (SpaceNode *)sl;
 +							snode->backdrop_zoom = 1.0;
 +						}
 +						if (sl->spacetype == SPACE_SEQ) {
 +							SpaceSeq *sseq = (SpaceSeq *)sl;
 +							sseq->overdrop_zoom = 1.0;
 +						}
 +					}
 +				}
 +			}
 +		}
 +
 +		if (!DNA_struct_elem_find(fd->filesdna, "SpaceIpo", "float", "backdrop_zoom")) {
 +			bScreen *sc;
 +			for (sc = main->screen.first; sc; sc = sc->id.next) {
 +				ScrArea *sa;
 +				for (sa = sc->areabase.first; sa; sa = sa->next) {
 +					SpaceLink *sl;
 +					for (sl = sa->spacedata.first; sl; sl = sl->next) {
 +						if (sl->spacetype == SPACE_IPO) {
 +							SpaceIpo *sipo = (SpaceIpo *)sl;
 +							sipo->backdrop_zoom = 1.0f;
 +							sipo->backdrop_opacity = 0.7f;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
  }