merging trunk 19093:19274
authorMartin Poirier <theeth@yahoo.com>
Fri, 13 Mar 2009 18:04:38 +0000 (18:04 +0000)
committerMartin Poirier <theeth@yahoo.com>
Fri, 13 Mar 2009 18:04:38 +0000 (18:04 +0000)
1  2 
source/blender/src/view.c

index 768bc715acaac6dfd9ae85124ac2515d81a295c5,0ce1512e2debeefa360b5ae425a2ae342a03076a..128f95715a869de43c35e442088da37ef3b0eb62
@@@ -75,7 -75,6 +75,7 @@@
  #include "BIF_space.h"
  #include "BIF_screen.h"
  #include "BIF_toolbox.h"
 +#include "BIF_sketch.h"
  
  #include "BSE_view.h"
  #include "BSE_edit.h"         /* For countall */
@@@ -84,7 -83,6 +84,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"
@@@ -1909,14 -1907,7 +1909,14 @@@ short  view3d_opengl_select(unsigned in
                draw_object(BASACT, DRAW_PICKING|DRAW_CONSTCOLOR);
        }
        else if ((G.obedit && G.obedit->type==OB_ARMATURE)) {
 -              draw_object(BASACT, DRAW_PICKING|DRAW_CONSTCOLOR);
 +              if (BIF_fullSketchMode())
 +              {
 +                      BDR_drawSketchNames();
 +              }
 +              else
 +              {
 +                      draw_object(BASACT, DRAW_PICKING|DRAW_CONSTCOLOR);
 +              }
        }
        else {
                Base *base;
@@@ -2039,7 -2030,7 +2039,7 @@@ void initlocalview(
        locallay= free_localbit();
  
        if(locallay==0) {
-               error("Sorry,  no more than 8 localviews");
+               error("Sorry, no more than 8 localviews");
                ok= 0;
        }
        else {