Merge 16964:17122
[blender.git] / source / blender / src / view.c
index 66af3539e88e8aebbaec4d2cb7caa53ec9d16ca9..0687faaeec843a9aabbd98ff0e1bf5921dff9169 100644 (file)
@@ -83,6 +83,7 @@
 #include "BDR_drawobject.h"    /* For draw_object */
 #include "BDR_editface.h"      /* For minmax_tface */
 #include "BDR_sculptmode.h"
+#include "BDR_sketch.h"
 
 #include "mydevice.h"
 #include "blendef.h"
@@ -1884,7 +1885,14 @@ short  view3d_opengl_select(unsigned int *buffer, unsigned int bufsize, short x1
                draw_object(BASACT, DRAW_PICKING|DRAW_CONSTCOLOR);
        }
        else if ((G.obedit && G.obedit->type==OB_ARMATURE)) {
-               draw_object(BASACT, DRAW_PICKING|DRAW_CONSTCOLOR);
+               if (G.scene->toolsettings->bone_sketching & BONE_SKETCHING)
+               {
+                       BDR_drawSketchNames();
+               }
+               else
+               {
+                       draw_object(BASACT, DRAW_PICKING|DRAW_CONSTCOLOR);
+               }
        }
        else {
                Base *base;