Commit: 07b09c949411f1896fa996bd10cc8599fdb573e9
Author: Julian Eisel
Date: Tue Jun 7 18:45:09 2016 +0200
Branches: soc-2016-layer_manager
https://developer.blender.org/rB07b09c949411f1896fa996bd10cc8599fdb573e9
Merge branch 'master' into soc-2016-layer_manager
Conflicts:
source/blender/editors/interface/interface_handlers.c
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/readfile.c
index cc1d9ec,621088c..5ef0549
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -6753,14 -6763,8 +6793,14 @@@ void blo_lib_link_screen_restore(Main *
else if (sl->spacetype == SPACE_LOGIC) {
SpaceLogic *slogic = (SpaceLogic *)sl;
- slogic->gpd =
restore_pointer_by_name(newmain, (ID *)slogic->gpd, USER_REAL);
+ slogic->gpd =
restore_pointer_by_name(id_map, (ID *)slogic->gpd, USER_REAL);
}
+#ifdef WITH_ADVANCED_LAYERS
+ else if (sl->spacetype == SPACE_LAYERS) {
+ SpaceLayers *slayer = (SpaceLayers *)sl;
+ slayer->flag |= SL_LAYERDATA_REFRESH;
+ }
+#endif
}
}
}
diff --cc source/blender/blenloader/intern/versioning_270.c
index c95a0b3,b7b6ace..1c1daa3
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1201,17 -1198,19 +1199,31 @@@ void blo_do_versions_270(FileData *fd,
camera->stereo.pole_merge_angle_to =
DEG2RAD(75.0f);
}
}
+
+ if (!DNA_struct_elem_find(fd->filesdna,
"NormalEditModifierData", "float", "mix_limit")) {
+ 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_NormalEdit) {
+ NormalEditModifierData *nemd =
(NormalEditModifierData *)md;
+ nemd->mix_limit =
DEG2RADF(180.0f);
+ }
+ }
+ }
+ }
}
+
+#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);
+ /* TODO convert old layers to new ones */
+ }
+ }
+ }
+#endif
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
