Merging trunk up to r39145.
authorJoerg Mueller <nexyon@gmail.com>
Sun, 7 Aug 2011 15:25:06 +0000 (15:25 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Sun, 7 Aug 2011 15:25:06 +0000 (15:25 +0000)
23 files changed:
1  2 
CMakeLists.txt
build_files/scons/config/darwin-config.py
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/blender.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_style.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/transform/transform_generics.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_files.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/gameengine/Converter/KX_BlenderSceneConverter.cpp

diff --cc CMakeLists.txt
Simple merge
@@@ -1562,22 -1556,14 +1565,29 @@@ 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 < 2)) {
+               bTheme *btheme;
+               for(btheme= U.themes.first; btheme; btheme= btheme->next) {
+                       btheme->tnode.noodle_curving = 5;
+               }
+       }
 +      if (bmain->versionfile < 258 || (bmain->versionfile == 258 && bmain->subversionfile < 1)) {
 +              bTheme *btheme;
 +              
 +              /* if new keyframes handle default is stuff "auto", make it "auto-clamped" instead */
 +              if (U.keyhandles_new == HD_AUTO) 
 +                      U.keyhandles_new = HD_AUTO_ANIM;
 +                      
 +              /* theme color additions */
 +              for (btheme= U.themes.first; btheme; btheme= btheme->next) {
 +                      /* auto-clamped handles -> based on auto */
 +                      SETCOL(btheme->tipo.handle_auto_clamped, 0x99, 0x40, 0x30, 255);
 +                      SETCOL(btheme->tipo.handle_sel_auto_clamped, 0xf0, 0xaf, 0x90, 255);
 +              }
 +      }
 +      
        /* GL Texture Garbage Collection (variable abused above!) */
        if (U.textimeout == 0) {
                U.texcollectrate = 60;