Merging r38993 through r39028 from trunk into sox-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 4 Aug 2011 16:52:26 +0000 (16:52 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 4 Aug 2011 16:52:26 +0000 (16:52 +0000)
1  2 
release/scripts/startup/bl_ui/space_userpref_keymap.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c

@@@ -244,16 -244,7 +244,18 @@@ enum 
        TH_DRAWEXTRA_FACEAREA,
        TH_DRAWEXTRA_FACEANG,
  
-       TH_LOCK_MARKER
 +      TH_MARKER_OUTLINE,
 +      TH_MARKER,
 +      TH_ACT_MARKER,
 +      TH_SEL_MARKER,
 +      TH_BUNDLE_SOLID,
 +      TH_DIS_MARKER,
 +      TH_PATH_BEFORE,
 +      TH_PATH_AFTER,
 +      TH_CAMERA_PATH,
++      TH_LOCK_MARKER,
++
+       TH_NODE_CURVING
  };
  /* XXX WARNING: previous is saved in file, so do not change order! */
  
@@@ -1591,31 -1556,14 +1594,38 @@@ void init_userdef_do_versions(void
                /* clear "AUTOKEY_FLAG_ONLYKEYINGSET" flag from userprefs, so that it doesn't linger around from old configs like a ghost */
                U.autokey_flag &= ~AUTOKEY_FLAG_ONLYKEYINGSET;
        }
-       
+       if (bmain->versionfile < 258 || (bmain->versionfile == 258 && bmain->subversionfile < 1)) {
+               bTheme *btheme;
+               for(btheme= U.themes.first; btheme; btheme= btheme->next) {
+                       btheme->tnode.noodle_curving = 5;
+               }
+       }
 +      {
 +              bTheme *btheme;
 +              for(btheme= U.themes.first; btheme; btheme= btheme->next) {
 +                      if(btheme->tv3d.bundle_solid[3] == 0)
 +                              SETCOL(btheme->tv3d.bundle_solid, 200, 200, 200, 255);
 +
 +                      if(btheme->tv3d.camera_path[3] == 0)
 +                              SETCOL(btheme->tv3d.camera_path, 0x00, 0x00, 0x00, 255);
 +
 +                      if((btheme->tclip.back[3]) == 0) {
 +                              btheme->tclip= btheme->tv3d;
 +
 +                              SETCOL(btheme->tclip.marker_outline, 0x00, 0x00, 0x00, 255);
 +                              SETCOL(btheme->tclip.marker, 0x7f, 0x7f, 0x00, 255);
 +                              SETCOL(btheme->tclip.act_marker, 0xff, 0xff, 0xff, 255);
 +                              SETCOL(btheme->tclip.sel_marker, 0xff, 0xff, 0x00, 255);
 +                              SETCOL(btheme->tclip.dis_marker, 0x7f, 0x00, 0x00, 255);
 +                              SETCOL(btheme->tclip.lock_marker, 0x7f, 0x7f, 0x7f, 255);
 +                              SETCOL(btheme->tclip.path_before, 0xff, 0x00, 0x00, 255);
 +                              SETCOL(btheme->tclip.path_after, 0x00, 0x00, 0xff, 255);
 +                      }
 +              }
 +      }
 +
        /* GL Texture Garbage Collection (variable abused above!) */
        if (U.textimeout == 0) {
                U.texcollectrate = 60;