svn merge -r 13177:13240 https://svn.blender.org/svnroot/bf-blender/trunk/blender

diff --cc source/blender/blenkernel/intern/Makefile
Simple merge

diff --cc source/blender/blenkernel/intern/softbody.c
Simple merge

diff --cc source/blender/blenloader/intern/readfile.c
Simple merge

diff --cc source/blender/blenloader/intern/writefile.c
Simple merge

diff --cc source/blender/include/butspace.h
Simple merge

diff --cc source/blender/makesdna/DNA_object_force.h
Simple merge

diff --cc source/blender/makesdna/DNA_userdef_types.h
index 138040b13ca665669acb9228d443483873fc6a06,68692b82ba57b5354776af4f57eae75377889a6d..9f118bd38cc639dc3b68436fc76d9ce2e48a5a91
--- 1/source/blender/makesdna/DNA_userdef_types.h
--- 2/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@@ -256,13 -257,28 +257,29 @@@ extern UserDef U; /* from usiblender.c 
  #define USER_HIDE_DOT                 (1 << 16)
  #define USER_SHOW_ROTVIEWICON (1 << 17)
  #define USER_SHOW_VIEWPORTNAME        (1 << 18)
- #define USER_KEYINSERTNEED            (1 << 19)
+ // old flag for #define USER_KEYINSERTNEED            (1 << 19)
  #define USER_ZOOM_TO_MOUSEPOS (1 << 20)
- #define USER_SHOW_FPS (1 << 21)
+ #define USER_SHOW_FPS                 (1 << 21)
 +#define USER_UNDOSAVE         (1 << 22) // flag to signal a write_undo() call after a save (save on exit needed then)  
  
- /* transopts */
+ /* Auto-Keying mode */
+       /* AUTOKEY_ON is a bitflag */
+ #define       AUTOKEY_ON                              1
+       /* AUTOKEY_ON + 2**n...  (i.e. AUTOKEY_MODE_NORMAL = AUTOKEY_ON + 2) to preserve setting, even when autokey turned off  */
+ #define               AUTOKEY_MODE_NORMAL             3
+ #define               AUTOKEY_MODE_EDITKEYS   5
+ 
+ /* Auto-Keying flag */
+ #define               AUTOKEY_FLAG_INSERTAVAIL        (1<<0)
+ #define               AUTOKEY_FLAG_INSERTNEEDED       (1<<1)
+ #define               AUTOKEY_FLAG_AUTOMATKEY         (1<<2)
  
+ /* Auto-Keying macros */
+ #define IS_AUTOKEY_ON                 (U.autokey_mode & AUTOKEY_ON)
+ #define IS_AUTOKEY_MODE(mode)         (U.autokey_mode == AUTOKEY_MODE_##mode)
+ #define IS_AUTOKEY_FLAG(flag) (U.autokey_flag == AUTOKEY_FLAG_##flag)
+ 
+ /* transopts */
  #define       USER_TR_TOOLTIPS                (1 << 0)
  #define       USER_TR_BUTTONS                 (1 << 1)
  #define USER_TR_MENUS                 (1 << 2)

diff --cc source/blender/src/buttons_editing.c
Simple merge

diff --cc source/blender/src/buttons_object.c
Simple merge

diff --cc source/blender/src/header_info.c
Simple merge

diff --cc source/blender/src/transform_conversions.c
Simple merge

diff --cc source/blender/src/usiblender.c
Simple merge