Commit: 980820124ada8adde1a6141d2092bd391bf6e6cd
Author: Julian Eisel
Date: Fri Jun 5 22:55:12 2015 +0200
Branches: UI-experiments UI-graphical-redesign
https://developer.blender.org/rB980820124ada8adde1a6141d2092bd391bf6e6cd
Merge branch 'master' into UI-graphical-redesign
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index 1e54aa8,37c2556..e9f3dd5
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -830,41 -830,19 +830,55 @@@ void blo_do_versions_270(FileData *fd,
scene->r.simplify_particles_render =
scene->r.simplify_particles;
}
}
+
+ if (!DNA_struct_elem_find(fd->filesdna, "DecimateModifierData",
"float", "defgrp_factor")) {
+ 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_Decimate)
{
+ DecimateModifierData *dmd =
(DecimateModifierData *)md;
+ dmd->defgrp_factor = 1.0f;
+ }
+ }
+ }
+ }
}
+
+ {
+ bScreen *screen;
+ for (screen = main->screen.first; screen; screen =
screen->id.next) {
+ ScrArea *sa;
+
+ for (sa = screen->areabase.first; sa; sa = sa->next) {
+ ARegion *ar;
+ SpaceLink *sl;
+
+ for (ar = sa->regionbase.first; ar; ar =
ar->next) {
+ if (ar->regiontype == RGN_TYPE_WINDOW) {
+ break;
+ }
+ }
+
+ if (ar) {
+ for (sl = sa->spacedata.first; sl; sl =
sl->next) {
+ switch (sl->spacetype) {
+ case SPACE_TIME:
+ case SPACE_ACTION:
+ case SPACE_NLA:
+ ar->v2d.flag |=
V2D_USES_UNITS_HORIZONTAL;
+ break;
+ case SPACE_IPO:
+ case SPACE_SEQ:
+ ar->v2d.flag |=
(V2D_USES_UNITS_HORIZONTAL | V2D_USES_UNITS_VERTICAL);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
