Commit: ddc8701c4027e34cfd5514bf8158261ccc3b82ea
Author: Julian Eisel
Date: Wed Jul 27 01:34:03 2016 +0200
Branches: temp_localview_split
https://developer.blender.org/rBddc8701c4027e34cfd5514bf8158261ccc3b82ea
Merge branch 'master' into temp_localview_split
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index 004bc84,a254a85..2302197
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1264,24 -1225,11 +1264,30 @@@ 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;
+ }
+ }
}
+
+ {
+ if (!DNA_struct_elem_find(fd->filesdna, "View3D",
"LocalViewAreaData", "localviewd")) {
+ for (bScreen *screen = main->screen.first; screen;
screen = screen->id.next) {
+ for (ScrArea *sa = screen->areabase.first; sa;
sa = sa->next) {
+ for (SpaceLink *sl =
sa->spacedata.first; sl; sl = sl->next) {
+ if (sl->spacetype ==
SPACE_VIEW3D) {
+
do_version_localview_areadata((View3D *)sl);
+ for (ARegion *ar =
sa->regionbase.first; ar; ar = ar->next) {
+ if
(ar->regiontype == RGN_TYPE_WINDOW) {
+
do_version_localview_regiondata(ar->regiondata);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
