[Bf-blender-cvs] [4063677] wiggly-widgets: Merge branch 'master' into wiggly-widgets

[Julian Eisel]

Commit: 406367751c1b313d351c58b9707b0f61bc9456b7
Author: Julian Eisel
Date:   Sat Aug 1 21:22:56 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB406367751c1b313d351c58b9707b0f61bc9456b7

Merge branch 'master' into wiggly-widgets

Conflicts:
	source/blender/blenkernel/intern/customdata.c
	source/blender/blenloader/intern/versioning_270.c

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



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

diff --cc source/blender/blenkernel/intern/customdata.c
index 1f864fb,7593ea1..35f5d5d
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@@ -1343,24 -1331,24 +1343,24 @@@ static const char *LAYERTYPENAMES[CD_NU
  
  
  const CustomDataMask CD_MASK_BAREMESH =
-     CD_MASK_MVERT | CD_MASK_MEDGE | CD_MASK_MFACE | CD_MASK_MLOOP | CD_MASK_MPOLY | CD_MASK_BWEIGHT | CD_MASK_FACEMAP;
 -    CD_MASK_MVERT | CD_MASK_MEDGE | CD_MASK_MLOOP | CD_MASK_MPOLY | CD_MASK_BWEIGHT;
++    CD_MASK_MVERT | CD_MASK_MEDGE | CD_MASK_MLOOP | CD_MASK_MPOLY | CD_MASK_BWEIGHT | CD_MASK_FACEMAP;
  const CustomDataMask CD_MASK_MESH =
-     CD_MASK_MVERT | CD_MASK_MEDGE | CD_MASK_MFACE |
-     CD_MASK_MDEFORMVERT | CD_MASK_MTFACE | CD_MASK_MCOL |
+     CD_MASK_MVERT | CD_MASK_MEDGE |
+     CD_MASK_MDEFORMVERT |
      CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_MDISPS |
      CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_MPOLY | CD_MASK_MLOOP |
      CD_MASK_MTEXPOLY | CD_MASK_RECAST | CD_MASK_PAINT_MASK |
      CD_MASK_GRID_PAINT_MASK | CD_MASK_MVERT_SKIN | CD_MASK_FREESTYLE_EDGE | CD_MASK_FREESTYLE_FACE |
 -    CD_MASK_CUSTOMLOOPNORMAL;
 +    CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_FACEMAP;
  const CustomDataMask CD_MASK_EDITMESH =
-     CD_MASK_MDEFORMVERT | CD_MASK_MTFACE | CD_MASK_MLOOPUV |
+     CD_MASK_MDEFORMVERT | CD_MASK_MLOOPUV |
      CD_MASK_MLOOPCOL | CD_MASK_MTEXPOLY | CD_MASK_SHAPE_KEYINDEX |
-     CD_MASK_MCOL | CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR |
+     CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR |
      CD_MASK_MDISPS | CD_MASK_SHAPEKEY | CD_MASK_RECAST | CD_MASK_PAINT_MASK |
 -    CD_MASK_GRID_PAINT_MASK | CD_MASK_MVERT_SKIN | CD_MASK_CUSTOMLOOPNORMAL;
 +    CD_MASK_GRID_PAINT_MASK | CD_MASK_MVERT_SKIN | CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_FACEMAP;
  const CustomDataMask CD_MASK_DERIVEDMESH =
-     CD_MASK_MDEFORMVERT | CD_MASK_MTFACE |
-     CD_MASK_MCOL | CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_CLOTH_ORCO |
+     CD_MASK_MDEFORMVERT |
+     CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_CLOTH_ORCO |
      CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_MTEXPOLY | CD_MASK_PREVIEW_MLOOPCOL |
      CD_MASK_PROP_STR | CD_MASK_ORIGSPACE | CD_MASK_ORIGSPACE_MLOOP | CD_MASK_ORCO | CD_MASK_TANGENT |
      CD_MASK_PREVIEW_MCOL | CD_MASK_SHAPEKEY | CD_MASK_RECAST |
diff --cc source/blender/blenloader/intern/versioning_270.c
index 7f61769,1e309f5..7c02c37
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -842,42 -842,13 +842,52 @@@ void blo_do_versions_270(FileData *fd, 
  			}
  		}
  	}
+ 
+ 	if (!MAIN_VERSION_ATLEAST(main, 275, 3)) {
+ 		Brush *br;
+ #define BRUSH_TORUS (1 << 1)
+ 		for (br = main->brush.first; br; br = br->id.next) {
+ 			br->flag &= ~BRUSH_TORUS;
+ 		}
+ #undef BRUSH_TORUS
+ 	}
++
 +	{
 +		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;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
  }