[Bf-blender-cvs] [d8567fc] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: d8567fc45dd1e487bd087e612c843fdd808f7806
Author: Bastien Montagne
Date:   Fri Feb 6 17:31:55 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBd8567fc45dd1e487bd087e612c843fdd808f7806

Merge branch 'master' into asset-experiments

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

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 613ade6,4ca1a44..5d436d3
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -534,59 -543,22 +546,49 @@@ void blo_do_versions_270(FileData *fd, 
  				}
  			}
  		}
- 	}
  
- 	if (!MAIN_VERSION_ATLEAST(main, 273, 3)) {
- 		ParticleSettings *part;
- 		for (part = main->particle.first; part; part = part->id.next) {
- 			if (part->clumpcurve)
- 				part->child_flag |= PART_CHILD_USE_CLUMP_CURVE;
- 			if (part->roughcurve)
- 				part->child_flag |= PART_CHILD_USE_ROUGH_CURVE;
+ 		if (!DNA_struct_elem_find(fd->filesdna, "NodePlaneTrackDeformData", "char", "flag")) {
+ 			FOREACH_NODETREE(main, ntree, id) {
+ 				if (ntree->type == NTREE_COMPOSIT) {
+ 					bNode *node;
+ 					for (node = ntree->nodes.first; node; node = node->next) {
+ 						if (ELEM(node->type, CMP_NODE_PLANETRACKDEFORM)) {
+ 							NodePlaneTrackDeformData *data = node->storage;
+ 							data->flag = 0;
+ 							data->motion_blur_samples = 16;
+ 							data->motion_blur_shutter = 0.5f;
+ 						}
+ 					}
+ 				}
+ 			}
+ 			FOREACH_NODETREE_END
  		}
  	}
 +
- 	if (!MAIN_VERSION_ATLEAST(main, 273, 6)) {
++	{
 +		bScreen *scr;
 +		ScrArea *sa;
 +		SpaceLink *sl;
 +		ARegion *ar;
 +
 +		for (scr = main->screen.first; scr; scr = scr->id.next) {
- 			/* add new regions for filebrowser */
++			/* Remove old deprecated region from filebrowsers */
 +			for (sa = scr->areabase.first; sa; sa = sa->next) {
 +				for (sl = sa->spacedata.first; sl; sl = sl->next) {
 +					if (sl->spacetype == SPACE_FILE) {
 +						for (ar = sl->regionbase.first; ar; ar = ar->next) {
 +							if (ar->regiontype == RGN_TYPE_CHANNELS) {
 +								break;
 +							}
 +						}
 +
 +						if (ar) {
 +							BKE_area_region_free(NULL, ar);
 +							BLI_freelinkN(&sl->regionbase, ar);
 +						}
 +					}
 +				}
 +			}
 +		}
- 
- 		if (!DNA_struct_elem_find(fd->filesdna, "NodePlaneTrackDeformData", "char", "flag")) {
- 			FOREACH_NODETREE(main, ntree, id) {
- 				if (ntree->type == NTREE_COMPOSIT) {
- 					bNode *node;
- 					for (node = ntree->nodes.first; node; node = node->next) {
- 						if (ELEM(node->type, CMP_NODE_PLANETRACKDEFORM)) {
- 							NodePlaneTrackDeformData *data = node->storage;
- 							data->flag = 0;
- 							data->motion_blur_samples = 16;
- 							data->motion_blur_shutter = 0.5f;
- 						}
- 					}
- 				}
- 			}
- 			FOREACH_NODETREE_END
- 		}
 +	}
  }