merge trunk 17122:17213

diff --cc source/blender/blenlib/BLI_arithb.h
Simple merge

diff --cc source/blender/blenlib/intern/arithb.c
Simple merge

diff --cc source/blender/include/BIF_editarmature.h
index df2965f49930d947245ec966de116fb0d10a9972,02d736808188b2826ca2103519b3df37126f8ffe..4c3ba94ccc18c91007ec466075d06daa87257c99
--- 1/source/blender/include/BIF_editarmature.h
--- 2/source/blender/include/BIF_editarmature.h
+++ b/source/blender/include/BIF_editarmature.h
@@@ -68,9 -68,8 +68,11 @@@ typedef struct EditBon
  
  } EditBone;
  
 +EditBone *addEditBone(char *name, struct ListBase *ebones, struct bArmature *arm);
 +
 +float rollBoneToVector(EditBone *bone, float new_up_axis[3]);
+ void  make_boneList(struct ListBase *list, struct ListBase *bones, EditBone *parent);
+ void  editbones_to_armature (struct ListBase *list, struct Object *ob);
  
  void  adduplicate_armature(void);
  void  addvert_armature(void);

diff --cc source/blender/makesdna/DNA_scene_types.h
index 9b7bfbebb3dfdd40d6f831e51e11747f6ca82621,c1c164f136f4427708581acfaa031be5be1af20a..b5e588ee7470de668086d0a21ac8a70a0716dcf8
--- 1/source/blender/makesdna/DNA_scene_types.h
--- 2/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -437,14 -440,13 +440,18 @@@ typedef struct ToolSettings 
        char  skgen_postpro;
        char  skgen_postpro_passes;
        char  skgen_subdivisions[3];
+       char  skgen_multi_level;
+       char  skgen_optimisation_method;
+       
+       char tpad[6];
        
 +      /* Skeleton Sketching */
 +      char bone_sketching;
 +      char skgen_subdivision_number;
 +      
        /* Alt+RMB option */
        char edge_mode;
-       char pad3[2];
++      char pad3[6];
  } ToolSettings;
  
  /* Used by all brushes to store their properties, which can be directly set
@@@ -841,13 -843,21 +848,22 @@@ typedef struct Scene 
  #define RETOPO_ELLIPSE 4
  
  /* toolsettings->skgen_options */
- #define SKGEN_FILTER_INTERNAL 1
- #define SKGEN_FILTER_EXTERNAL 2
- #define       SKGEN_SYMMETRY                  4
- #define       SKGEN_CUT_LENGTH                8
- #define       SKGEN_CUT_ANGLE                 16
- #define       SKGEN_CUT_CORRELATION   32
+ #define SKGEN_FILTER_INTERNAL (1 << 0)
+ #define SKGEN_FILTER_EXTERNAL (1 << 1)
+ #define       SKGEN_SYMMETRY                  (1 << 2)
+ #define       SKGEN_CUT_LENGTH                (1 << 3)
+ #define       SKGEN_CUT_ANGLE                 (1 << 4)
+ #define       SKGEN_CUT_CORRELATION   (1 << 5)
+ #define       SKGEN_HARMONIC                  (1 << 6)
+ #define       SKGEN_STICK_TO_EMBEDDING        (1 << 7)
+ #define       SKGEN_ADAPTIVE_DISTANCE         (1 << 8)
+ #define SKGEN_FILTER_SMART            (1 << 9)
+ #define SKGEN_DISP_LENGTH             (1 << 10)
+ #define SKGEN_DISP_WEIGHT             (1 << 11)
+ #define SKGEN_DISP_ORIG                       (1 << 12)
+ #define SKGEN_DISP_EMBED              (1 << 13)
+ #define SKGEN_DISP_INDEX              (1 << 14)
 +#define       SKGEN_CUT_FIXED                 64
  
  #define       SKGEN_SUB_LENGTH                0
  #define       SKGEN_SUB_ANGLE                 1

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

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

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

diff --cc source/blender/src/space.c
index b52ffd54fcf6a5edbb459e27beaeffd6c37722ca,b6221c2f84b5926138c62db0b51b681836bb3fb7..cbb4fe2624ca09a907632e22870d3c538dec3245
--- 1/source/blender/src/space.c
--- 2/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@@ -1255,8 -1258,7 +1260,8 @@@ static void winqreadview3dspace(ScrAre
                                if (BPY_do_spacehandlers(sa, event, val, SPACEHANDLER_VIEW3D_EVENT))
                                        return; /* return if event was processed (swallowed) by handler(s) */
                        }
-                       
+ #endif
 +                      if(BIF_paintSketch(LEFTMOUSE)) return;
                        if(gpencil_do_paint(sa, L_MOUSE)) return;
                        if(BIF_do_manipulator(sa)) return;
                }

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