Commit: 35e510f01aadf0a17e6846ba1f88e00cdb2698ae
Author: Julian Eisel
Date: Wed Jul 13 16:25:52 2016 +0200
Branches: soc-2016-layer_manager
https://developer.blender.org/rB35e510f01aadf0a17e6846ba1f88e00cdb2698ae
Merge branch 'master' into soc-2016-layer_manager
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index e2a4049,ac2811a..8492880
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1214,24 -1212,18 +1214,37 @@@ void blo_do_versions_270(FileData *fd,
}
}
}
+
+ if (!DNA_struct_elem_find(fd->filesdna, "BooleanModifierData",
"float", "double_threshold")) {
+ Object *ob;
+ for (ob = main->object.first; ob; ob = ob->id.next) {
+ ModifierData *md;
+ for (md = ob->modifiers.first; md; md =
md->next) {
+ if (md->type == eModifierType_Boolean) {
+ BooleanModifierData *bmd =
(BooleanModifierData *)md;
+ bmd->double_threshold = 1e-6f;
+ }
+ }
+ }
+ }
}
+
+#ifdef WITH_ADVANCED_LAYERS
+ /* 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);
+ }
+ }
+ }
+ }
+#endif
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
