Commit: 334c14dc4ce77f229529182bcadbb910632d4bca
Author: Julian Eisel
Date:   Mon Dec 21 20:34:32 2015 +0100
Branches: wiggly-widgets
https://developer.blender.org/rB334c14dc4ce77f229529182bcadbb910632d4bca

Merge branch 'master' into wiggly-widgets

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 19d8a4f,816eb87..ffc50cd
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1029,44 -1029,11 +1029,50 @@@ void blo_do_versions_270(FileData *fd, 
                        else
                                gpd->flag &= ~GP_DATA_SHOW_ONIONSKINS;
                }
+ 
+               if (!DNA_struct_elem_find(fd->filesdna, "Object", "unsigned 
char", "max_jumps")) {
+                       for (Object *ob = main->object.first; ob; ob = 
ob->id.next) {
+                               ob->max_jumps = 1;
+                       }
+               }
        }
 +
 +      {
 +              if (!DNA_struct_elem_find(fd->filesdna, "SpaceNode", "float", 
"backdrop_zoom")) {
 +                      bScreen *sc;
 +                      for (sc = main->screen.first; sc; sc = sc->id.next) {
 +                              ScrArea *sa;
 +                              for (sa = sc->areabase.first; sa; sa = 
sa->next) {
 +                                      SpaceLink *sl;
 +                                      for (sl = sa->spacedata.first; sl; sl = 
sl->next) {
 +                                              if (sl->spacetype == 
SPACE_NODE) {
 +                                                      SpaceNode *snode = 
(SpaceNode *)sl;
 +                                                      snode->backdrop_zoom = 
1.0;
 +                                              }
 +                                              if (sl->spacetype == SPACE_SEQ) 
{
 +                                                      SpaceSeq *sseq = 
(SpaceSeq *)sl;
 +                                                      sseq->overdrop_zoom = 
1.0;
 +                                              }
 +                                      }
 +                              }
 +                      }
 +              }
 +
 +              if (!DNA_struct_elem_find(fd->filesdna, "SpaceIpo", "float", 
"backdrop_zoom")) {
 +                      bScreen *sc;
 +                      for (sc = main->screen.first; sc; sc = sc->id.next) {
 +                              ScrArea *sa;
 +                              for (sa = sc->areabase.first; sa; sa = 
sa->next) {
 +                                      SpaceLink *sl;
 +                                      for (sl = sa->spacedata.first; sl; sl = 
sl->next) {
 +                                              if (sl->spacetype == SPACE_IPO) 
{
 +                                                      SpaceIpo *sipo = 
(SpaceIpo *)sl;
 +                                                      sipo->backdrop_zoom = 
1.0f;
 +                                                      sipo->backdrop_opacity 
= 0.7f;
 +                                              }
 +                                      }
 +                              }
 +                      }
 +              }
 +      }
  }

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to