[Bf-blender-cvs] [769237e] soc-2016-layer_manager: Merge branch 'master' into soc-2016-layer_manager

[Julian Eisel]

Commit: 769237ee7815888027f1a0bcd10ae6b952301b9b
Author: Julian Eisel
Date:   Tue Jul 26 17:37:07 2016 +0200
Branches: soc-2016-layer_manager
https://developer.blender.org/rB769237ee7815888027f1a0bcd10ae6b952301b9b

Merge branch 'master' into soc-2016-layer_manager

Conflicts:
	source/blender/editors/space_outliner/outliner_tools.c

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 58bc8b3,a254a85..ee686f7
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1227,22 -1225,11 +1227,28 @@@ void blo_do_versions_270(FileData *fd, 
  				}
  			}
  		}
+ 
+ 		for (Brush *br = main->brush.first; br; br = br->id.next) {
+ 			if (br->sculpt_tool == SCULPT_TOOL_FLATTEN) {
+ 				br->flag |= BRUSH_ACCUMULATE;
+ 			}
+ 		}
  	}
 +
 +	/* Convert to new layer system */
 +	if (!MAIN_VERSION_ATLEAST(main, 277, 2)) {
 +		if (!DNA_struct_elem_find(fd->filesdna, "Scene", "LayerTree", "object_layers")) {
 +			for (Scene *sce = main->scene.first; sce; sce = sce->id.next) {
 +				sce->object_layers = BKE_layertree_new(LAYER_TREETYPE_OBJECT);
 +				LayerTreeItem *litem = BKE_objectlayer_add(sce->object_layers, NULL, "Default layer");
 +				sce->object_layers->active_layer = litem;
 +
 +				BKE_objectlayer_base_entries_reserve(litem, BLI_listbase_count(&sce->base));
 +				/* For now, simply create a new layer and move all objects into it */
 +				for (Base *base = sce->base.first; base; base = base->next) {
 +					BKE_objectlayer_base_assign(base, litem, true);
 +				}
 +			}
 +		}
 +	}
  }