Merge with trunk, revision 28528 - 28976.
[blender.git] / source / blender / editors / space_view3d / drawobject.c
index fabb4dd4bd7b2b9315fac9d1e56b465f50eb0425..89a82e51cd8ba5e952a5388125338ab9ee80096d 100644 (file)
 #include <string.h>
 #include <math.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MEM_guardedalloc.h"
 
-#include "IMB_imbuf.h"
-
-
-
-
-#include "DNA_armature_types.h"
-#include "DNA_boid_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_constraint_types.h" // for drawing constraint
-#include "DNA_effect_types.h"
 #include "DNA_lamp_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_material_types.h"
-#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_meta_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_object_types.h"
-#include "DNA_object_force.h"
-#include "DNA_object_fluidsim.h"
-#include "DNA_particle_types.h"
-#include "DNA_space_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
 #include "DNA_smoke_types.h"
-#include "DNA_userdef_types.h"
-#include "DNA_view3d_types.h"
 #include "DNA_world_types.h"
 
 #include "BLI_blenlib.h"
 #include "BIF_glutil.h"
 
 #include "GPU_draw.h"
-#include "GPU_material.h"
 #include "GPU_extensions.h"
 
 #include "ED_mesh.h"
 #include "ED_screen.h"
 #include "ED_sculpt.h"
 #include "ED_types.h"
-#include "ED_util.h"
 
 #include "UI_resources.h"
-#include "UI_interface_icons.h"
 
 #include "WM_api.h"
 #include "wm_subwindow.h"
 ((vd->drawtype==OB_TEXTURE && dt>OB_SOLID) || \
        (vd->drawtype==OB_SOLID && vd->flag2 & V3D_SOLID_TEX))
 
-#define CHECK_OB_DRAWFACEDOT(sce, vd, dt) \
-(      (sce->toolsettings->selectmode & SCE_SELECT_FACE) && \
-       (vd->drawtype<=OB_SOLID) && \
-       (G.f & G_BACKBUFSEL)==0 && \
-       (((vd->drawtype==OB_SOLID) && (dt>=OB_SOLID) && (vd->flag2 & V3D_SOLID_TEX) && (vd->flag & V3D_ZBUF_SELECT)) == 0) \
-       )
-
 static void draw_bounding_volume(Scene *scene, Object *ob);
 
 static void drawcube_size(float size);
@@ -140,6 +108,26 @@ static void drawcircle_size(float size);
 static void draw_empty_sphere(float size);
 static void draw_empty_cone(float size);
 
+static int check_ob_drawface_dot(Scene *sce, View3D *vd, char dt)
+{
+       if((sce->toolsettings->selectmode & SCE_SELECT_FACE) == 0)
+               return 0;
+
+       if(G.f & G_BACKBUFSEL)
+               return 0;
+
+       if((vd->flag & V3D_ZBUF_SELECT) == 0)
+               return 1;
+
+       /* if its drawing textures with zbuf sel, then dont draw dots */
+       if(dt==OB_TEXTURE && vd->drawtype==OB_TEXTURE)
+               return 0;
+
+       if(vd->drawtype>=OB_SOLID && vd->flag2 & V3D_SOLID_TEX)
+               return 0;
+
+       return 1;
+}
 
 /* ************* only use while object drawing **************
  * or after running ED_view3d_init_mats_rv3d
@@ -332,8 +320,109 @@ static float cosval[32] ={
        1.00000000
 };
 
+static void draw_xyz_wire(RegionView3D *rv3d, float mat[][4], float *c, float size, int axis)
+{
+       float v1[3]= {0.f, 0.f, 0.f}, v2[3] = {0.f, 0.f, 0.f};
+       float imat[4][4];
+       float dim;
+       float dx[3], dy[3];
+
+       /* hrms, really only works properly after glLoadMatrixf(rv3d->viewmat); */
+       float pixscale= rv3d->persmat[0][3]*c[0]+ rv3d->persmat[1][3]*c[1]+ rv3d->persmat[2][3]*c[2] + rv3d->persmat[3][3];
+       pixscale*= rv3d->pixsize;
+
+       /* halfway blend between fixed size in worldspace vs viewspace -
+        * alleviates some of the weirdness due to not using viewmat for gl matrix */
+       dim = (0.05*size*0.5) + (size*10.f*pixscale*0.5);
+
+       invert_m4_m4(imat, mat);
+       normalize_v3(imat[0]);
+       normalize_v3(imat[1]);
+       
+       copy_v3_v3(dx, imat[0]);
+       copy_v3_v3(dy, imat[1]);
+       
+       mul_v3_fl(dx, dim);
+       mul_v3_fl(dy, dim);
+
+       switch(axis) {
+               case 0:         /* x axis */
+                       glBegin(GL_LINES);
+                       
+                       /* bottom left to top right */
+                       sub_v3_v3v3(v1, c, dx);
+                       sub_v3_v3(v1, dy);
+                       add_v3_v3v3(v2, c, dx);
+                       add_v3_v3(v2, dy);
+                       
+                       glVertex3fv(v1);
+                       glVertex3fv(v2);
+                       
+                       /* top left to bottom right */
+                       mul_v3_fl(dy, 2.f);
+                       add_v3_v3(v1, dy);
+                       sub_v3_v3(v2, dy);
+                       
+                       glVertex3fv(v1);
+                       glVertex3fv(v2);
+                       
+                       glEnd();
+                       break;
+               case 1:         /* y axis */
+                       glBegin(GL_LINES);
+                       
+                       /* bottom left to top right */
+                       mul_v3_fl(dx, 0.75f);
+                       sub_v3_v3v3(v1, c, dx);
+                       sub_v3_v3(v1, dy);
+                       add_v3_v3v3(v2, c, dx);
+                       add_v3_v3(v2, dy);
+                       
+                       glVertex3fv(v1);
+                       glVertex3fv(v2);
+                       
+                       /* top left to center */
+                       mul_v3_fl(dy, 2.f);
+                       add_v3_v3(v1, dy);
+                       copy_v3_v3(v2, c);
+                       
+                       glVertex3fv(v1);
+                       glVertex3fv(v2);
+                       
+                       glEnd();
+                       break;
+               case 2:         /* z axis */
+                       glBegin(GL_LINE_STRIP);
+                       
+                       /* start at top left */
+                       sub_v3_v3v3(v1, c, dx);
+                       add_v3_v3v3(v1, c, dy);
+                       
+                       glVertex3fv(v1);
+                       
+                       mul_v3_fl(dx, 2.f);
+                       add_v3_v3(v1, dx);
+
+                       glVertex3fv(v1);
+                       
+                       mul_v3_fl(dy, 2.f);
+                       sub_v3_v3(v1, dx);
+                       sub_v3_v3(v1, dy);
+                       
+                       glVertex3fv(v1);
+                       
+                       add_v3_v3(v1, dx);
+               
+                       glVertex3fv(v1);
+                       
+                       glEnd();
+                       break;
+       }
+       
+}
+
 /* flag is same as for draw_object */
-void drawaxes(float size, int flag, char drawtype)
+void drawaxes(RegionView3D *rv3d, float mat[][4], float size, int flag, char drawtype)
 {
        int axis;
        float v1[3]= {0.0, 0.0, 0.0};
@@ -419,12 +508,12 @@ void drawaxes(float size, int flag, char drawtype)
                        glVertex3fv(v1);
                        glVertex3fv(v2);
                                
-                       v1[axis]= size*0.8;
-                       v1[arrow_axis]= -size*0.125;
+                       v1[axis]= size*0.85;
+                       v1[arrow_axis]= -size*0.08;
                        glVertex3fv(v1);
                        glVertex3fv(v2);
                                
-                       v1[arrow_axis]= size*0.125;
+                       v1[arrow_axis]= size*0.08;
                        glVertex3fv(v1);
                        glVertex3fv(v2);
                        
@@ -432,15 +521,7 @@ void drawaxes(float size, int flag, char drawtype)
                                
                        v2[axis]+= size*0.125;
                        
-                       // patch for 3d cards crashing on glSelect for text drawing (IBM)
-                       if((flag & DRAW_PICKING) == 0) {
-                               if (axis==0)
-                                       view3d_cached_text_draw_add(v2[0], v2[1], v2[2], "x", 0, V3D_CACHE_TEXT_ZBUF);
-                               else if (axis==1)
-                                       view3d_cached_text_draw_add(v2[0], v2[1], v2[2], "y", 0, V3D_CACHE_TEXT_ZBUF);
-                               else
-                                       view3d_cached_text_draw_add(v2[0], v2[1], v2[2], "z", 0, V3D_CACHE_TEXT_ZBUF);
-                       }
+                       draw_xyz_wire(rv3d, mat, v2, size, axis);
                }
                break;
        }
@@ -549,14 +630,14 @@ void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, int depth_write, floa
        }
 
        if(tot) {
+#if 0
                bglMats mats; /* ZBuffer depth vars */
                double ux, uy, uz;
                float depth;
 
                if(v3d->zbuf)
                        bgl_get_mats(&mats);
-
-
+#endif
                if(rv3d->rflag & RV3D_CLIPPING)
                        for(a=0; a<6; a++)
                                glDisable(GL_CLIP_PLANE0+a);
@@ -573,7 +654,7 @@ void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, int depth_write, floa
                else glDepthMask(0);
                
                for(vos= strings->first; vos; vos= vos->next) {
-
+#if 0       // too slow, reading opengl info while drawing is very bad, better to see if we cn use the zbuffer while in pixel space - campbell
                        if(v3d->zbuf && (vos->flag & V3D_CACHE_TEXT_ZBUF)) {
                                gluProject(vos->vec[0], vos->vec[1], vos->vec[2], mats.modelview, mats.projection, (GLint *)mats.viewport, &ux, &uy, &uz);
                                glReadPixels(ar->winrct.xmin+vos->mval[0]+vos->xoffs, ar->winrct.ymin+vos->mval[1], 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depth);
@@ -581,7 +662,7 @@ void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, int depth_write, floa
                                if(uz > depth)
                                        continue;
                        }
-
+#endif
                        if(vos->mval[0]!=IS_CLIPPED) {
                                glColor3fv(vos->col);
                                BLF_draw_default((float)vos->mval[0]+vos->xoffs, (float)vos->mval[1], (depth_write)? 0.0f: 2.0f, vos->str);
@@ -907,21 +988,23 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
                        
                /* Outer circle */
                circrad = 3.0f*lampsize;
+               setlinestyle(3);
+
                drawcircball(GL_LINE_LOOP, vec, circrad, imat);
-       }
-       else
-               circrad = 0.0f;
-       
-       setlinestyle(3);
 
-       /* draw dashed outer circle if shadow is on. remember some lamps can't have certain shadows! */
-       if (la->type!=LA_HEMI) {
-               if ((la->mode & LA_SHAD_RAY) ||
-                       ((la->mode & LA_SHAD_BUF) && (la->type==LA_SPOT)) )
-               {
-                       drawcircball(GL_LINE_LOOP, vec, circrad + 3.0f*pixsize, imat);
+               /* draw dashed outer circle if shadow is on. remember some lamps can't have certain shadows! */
+               if(la->type!=LA_HEMI) {
+                       if(     (la->mode & LA_SHAD_RAY) ||
+                               ((la->mode & LA_SHAD_BUF) && (la->type==LA_SPOT))
+                       ) {
+                               drawcircball(GL_LINE_LOOP, vec, circrad + 3.0f*pixsize, imat);
+                       }
                }
        }
+       else {
+               setlinestyle(3);
+               circrad = 0.0f;
+       }
        
        /* draw the pretty sun rays */
        if(la->type==LA_SUN) {
@@ -1333,14 +1416,16 @@ static void drawlattice(Scene *scene, View3D *v3d, Object *ob)
        Lattice *lt= ob->data;
        DispList *dl;
        int u, v, w;
-       int use_wcol= 0;
+       int use_wcol= 0, is_edit= (lt->editlatt != NULL);
 
        /* now we default make displist, this will modifiers work for non animated case */
        if(ob->disp.first==NULL)
                lattice_calc_modifiers(scene, ob);
        dl= find_displist(&ob->disp, DL_VERTS);
        
-       if(lt->editlatt) {
+       if(is_edit) {
+               lt= lt->editlatt;
+
                cpack(0x004000);
                
                if(ob->defbase.first && lt->dvert) {
@@ -1349,8 +1434,6 @@ static void drawlattice(Scene *scene, View3D *v3d, Object *ob)
                }
        }
        
-       if(lt->editlatt) lt= lt->editlatt;
-       
        glBegin(GL_LINES);
        for(w=0; w<lt->pntsw; w++) {
                int wxt = (w==0 || w==lt->pntsw-1);
@@ -1380,7 +1463,7 @@ static void drawlattice(Scene *scene, View3D *v3d, Object *ob)
        if(use_wcol)
                glShadeModel(GL_FLAT);
 
-       if( ((Lattice *)ob->data)->editlatt ) {
+       if(is_edit) {
                if(v3d->zbuf) glDisable(GL_DEPTH_TEST);
                
                lattice_draw_verts(lt, dl, 0);
@@ -1809,7 +1892,7 @@ static int draw_dm_creases__setDrawOptions(void *userData, int index)
        EditEdge *eed = EM_get_edge_for_index(index);
 
        if (eed->h==0 && eed->crease!=0.0) {
-               UI_ThemeColorBlend(TH_WIRE, TH_EDGE_SELECT, eed->crease);
+               UI_ThemeColorBlend(TH_WIRE, TH_EDGE_CREASE, eed->crease);
                return 1;
        } else {
                return 0;
@@ -1908,7 +1991,7 @@ static void draw_em_fancy_verts(Scene *scene, View3D *v3d, Object *obedit, EditM
                                draw_dm_verts(cageDM, sel, eve_act);
                        }
                        
-                       if( CHECK_OB_DRAWFACEDOT(scene, v3d, obedit->dt) ) {
+                       if(check_ob_drawface_dot(scene, v3d, obedit->dt)) {
                                glPointSize(fsize);
                                glColor4ubv((GLubyte *)fcol);
                                draw_dm_face_centers(cageDM, sel);
@@ -2237,7 +2320,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object
        else {
                if (cageDM!=finalDM) {
                        UI_ThemeColorBlend(TH_WIRE, TH_BACK, 0.7);
-                       finalDM->drawEdges(finalDM, 1);
+                       finalDM->drawEdges(finalDM, 1, 0);
                }
        }
        
@@ -2359,7 +2442,7 @@ static void draw_mesh_object_outline(View3D *v3d, Object *ob, DerivedMesh *dm)
                        GPU_disable_material();
                }
                else {
-                       dm->drawEdges(dm, 0);
+                       dm->drawEdges(dm, 0, 1);
                }
                                        
                glLineWidth(1.0);
@@ -2403,7 +2486,8 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
        if (ob==OBACT && paint_facesel_test(ob)) draw_wire = 0;
 
        if(dt==OB_BOUNDBOX) {
-               draw_bounding_volume(scene, ob);
+               if((v3d->flag2 & V3D_RENDER_OVERRIDE && v3d->drawtype >= OB_WIRE)==0)
+                       draw_bounding_volume(scene, ob);
        }
        else if(hasHaloMat || (totface==0 && totedge==0)) {
                glPointSize(1.5);
@@ -2441,7 +2525,8 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
                        else
                                UI_ThemeColor(TH_WIRE);
 
-                       dm->drawLooseEdges(dm);
+                       if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0)
+                               dm->drawLooseEdges(dm);
                }
        }
        else if(dt==OB_SOLID) {
@@ -2459,7 +2544,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
                        glEnable(GL_LINE_STIPPLE);
                        glLineStipple(1, 0x8888);
 
-                       dm->drawEdges(dm, 1);
+                       dm->drawEdges(dm, 1, 0);
 
                        bglPolygonOffset(rv3d->dist, 0.0);
                        glDepthMask(1);
@@ -2486,9 +2571,11 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
                                int fast= (p->flags & PAINT_FAST_NAVIGATE) && (rv3d->rflag & RV3D_NAVIGATING);
 
                                if(ob->sculpt->partial_redraw) {
-                                       sculpt_get_redraw_planes(planes, ar, rv3d, ob);
-                                       fpl = planes;
-                                       ob->sculpt->partial_redraw = 0;
+                                       if(ar->do_draw & RGN_DRAW_PARTIAL) {
+                                               sculpt_get_redraw_planes(planes, ar, rv3d, ob);
+                                               fpl = planes;
+                                               ob->sculpt->partial_redraw = 0;
+                                       }
                                }
 
                                dm->drawFacesSolid(dm, fpl, fast, GPU_enable_material);
@@ -2506,7 +2593,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
                        } else {
                                UI_ThemeColor(TH_WIRE);
                        }
-                       if(!ob->sculpt)
+                       if(!ob->sculpt && (v3d->flag2 & V3D_RENDER_OVERRIDE)==0)
                                dm->drawLooseEdges(dm);
                }
        }
@@ -2573,7 +2660,8 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
                        } else {
                                UI_ThemeColor(TH_WIRE);
                        }
-                       dm->drawLooseEdges(dm);
+                       if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0)
+                               dm->drawLooseEdges(dm);
                }
        }
        
@@ -2627,8 +2715,9 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
                        glDepthMask(0); // disable write in zbuffer, selected edge wires show better
                }
                
-               dm->drawEdges(dm, (dt==OB_WIRE || totface==0));
-               
+               if((v3d->flag2 & V3D_RENDER_OVERRIDE && v3d->drawtype >= OB_SOLID)==0)
+                       dm->drawEdges(dm, (dt==OB_WIRE || totface==0), 0);
+
                if (dt!=OB_WIRE && draw_wire==2) {
                        glDepthMask(1);
                        bglPolygonOffset(rv3d->dist, 0.0);
@@ -2970,7 +3059,7 @@ static void drawDispListshaded(ListBase *lb, Object *ob)
 static void drawCurveDMWired(Object *ob)
 {
        DerivedMesh *dm = ob->derivedFinal;
-       dm->drawEdges (dm, 1);
+       dm->drawEdges (dm, 1, 0);
 }
 
 /* return 1 when nothing was drawn */
@@ -2978,7 +3067,6 @@ static int drawCurveDerivedMesh(Scene *scene, View3D *v3d, RegionView3D *rv3d, B
 {
        Object *ob= base->object;
        DerivedMesh *dm = ob->derivedFinal;
-       Curve *cu= ob->data;
 
        if (!dm) {
                return 1;
@@ -2996,7 +3084,8 @@ static int drawCurveDerivedMesh(Scene *scene, View3D *v3d, RegionView3D *rv3d, B
                glDisable(GL_LIGHTING);
                GPU_end_object_materials();
        } else {
-               drawCurveDMWired (ob);
+               if((v3d->flag2 & V3D_RENDER_OVERRIDE && v3d->drawtype >= OB_SOLID)==0)
+                       drawCurveDMWired (ob);
        }
 
        return 0;
@@ -3755,7 +3844,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
                float *cd2=0,*cdata2=0;
 
                /* setup gl flags */
-               if(ob_dt > OB_WIRE) {
+               if (1) { //ob_dt > OB_WIRE) {
                        glEnableClientState(GL_NORMAL_ARRAY);
 
                        if(part->draw&PART_DRAW_MAT_COL)
@@ -3765,13 +3854,13 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
                        glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
                        glEnable(GL_COLOR_MATERIAL);
                }
-               else {
+               /*else {
                        glDisableClientState(GL_NORMAL_ARRAY);
 
                        glDisable(GL_COLOR_MATERIAL);
                        glDisable(GL_LIGHTING);
                        UI_ThemeColor(TH_WIRE);
-               }
+               }*/
 
                if(totchild && (part->draw&PART_DRAW_PARENT)==0)
                        totpart=0;
@@ -3785,7 +3874,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
                        if(path->steps > 0) {
                                glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->co);
 
-                               if(ob_dt > OB_WIRE) {
+                               if(1) { //ob_dt > OB_WIRE) {
                                        glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), path->vel);
                                        if(part->draw&PART_DRAW_MAT_COL)
                                                glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->col);
@@ -3801,7 +3890,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
                        path=cache[a];
                        glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->co);
 
-                       if(ob_dt > OB_WIRE) {
+                       if(1) { //ob_dt > OB_WIRE) {
                                glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), path->vel);
                                if(part->draw&PART_DRAW_MAT_COL)
                                        glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->col);
@@ -3812,7 +3901,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 
 
                /* restore & clean up */
-               if(ob_dt > OB_WIRE) {
+               if(1) { //ob_dt > OB_WIRE) {
                        if(part->draw&PART_DRAW_MAT_COL)
                                glDisable(GL_COLOR_ARRAY);
                        glDisable(GL_COLOR_MATERIAL);
@@ -4332,17 +4421,19 @@ static void tekenhandlesN_active(Nurb *nu)
        glLineWidth(1);
 }
 
-static void tekenvertsN(Nurb *nu, short sel, short hide_handles)
+static void tekenvertsN(Nurb *nu, short sel, short hide_handles, void *lastsel)
 {
        BezTriple *bezt;
        BPoint *bp;
        float size;
-       int a;
+       int a, color;
 
        if(nu->hide) return;
 
-       if(sel) UI_ThemeColor(TH_VERTEX_SELECT);
-       else UI_ThemeColor(TH_VERTEX);
+       if(sel) color= TH_VERTEX_SELECT;
+       else color= TH_VERTEX;
+
+       UI_ThemeColor(color);
 
        size= UI_GetThemeValuef(TH_VERTEX_SIZE);
        glPointSize(size);
@@ -4355,7 +4446,17 @@ static void tekenvertsN(Nurb *nu, short sel, short hide_handles)
                a= nu->pntsu;
                while(a--) {
                        if(bezt->hide==0) {
-                               if (hide_handles) {
+                               if (bezt == lastsel) {
+                                       UI_ThemeColor(TH_LASTSEL_POINT);
+                                       bglVertex3fv(bezt->vec[1]);
+
+                                       if (!hide_handles) {
+                                               bglVertex3fv(bezt->vec[0]);
+                                               bglVertex3fv(bezt->vec[2]);
+                                       }
+
+                                       UI_ThemeColor(color);
+                               } else if (hide_handles) {
                                        if((bezt->f2 & SELECT)==sel) bglVertex3fv(bezt->vec[1]);
                                } else {
                                        if((bezt->f1 & SELECT)==sel) bglVertex3fv(bezt->vec[0]);
@@ -4371,7 +4472,13 @@ static void tekenvertsN(Nurb *nu, short sel, short hide_handles)
                a= nu->pntsu*nu->pntsv;
                while(a--) {
                        if(bp->hide==0) {
-                               if((bp->f1 & SELECT)==sel) bglVertex3fv(bp->vec);
+                               if (bp == lastsel) {
+                                       UI_ThemeColor(TH_LASTSEL_POINT);
+                                       bglVertex3fv(bp->vec);
+                                       UI_ThemeColor(color);
+                               } else {
+                                       if((bp->f1 & SELECT)==sel) bglVertex3fv(bp->vec);
+                               }
                        }
                        bp++;
                }
@@ -4596,7 +4703,7 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
        for(nu=nurb; nu; nu=nu->next) {
                if(nu->type == CU_BEZIER && (cu->drawflag & CU_HIDE_HANDLES)==0)
                        tekenhandlesN(nu, 1, hide_handles);
-               tekenvertsN(nu, 0, hide_handles);
+               tekenvertsN(nu, 0, hide_handles, NULL);
        }
        
        if(v3d->zbuf) glEnable(GL_DEPTH_TEST);
@@ -4618,8 +4725,8 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
 
                                mul_qt_v3(bevp->quat, vec_a);
                                mul_qt_v3(bevp->quat, vec_b);
-                               add_v3_v3v3(vec_a, vec_a, bevp->vec);
-                               add_v3_v3v3(vec_b, vec_b, bevp->vec);
+                               add_v3_v3(vec_a, bevp->vec);
+                               add_v3_v3(vec_b, bevp->vec);
                                
                                VECSUBFAC(vec_a, vec_a, bevp->dir, fac);
                                VECSUBFAC(vec_b, vec_b, bevp->dir, fac);
@@ -4639,7 +4746,7 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
        if(v3d->zbuf) glDisable(GL_DEPTH_TEST);
        
        for(nu=nurb; nu; nu=nu->next) {
-               tekenvertsN(nu, 1, hide_handles);
+               tekenvertsN(nu, 1, hide_handles, cu->lastsel);
        }
        
        if(v3d->zbuf) glEnable(GL_DEPTH_TEST); 
@@ -5025,13 +5132,13 @@ static void draw_forcefield(Scene *scene, Object *ob, RegionView3D *rv3d)
 
                        /*path end*/
                        setlinestyle(3);
-                       where_on_path(ob, 1.0f, guidevec1, guidevec2, NULL, NULL);
+                       where_on_path(ob, 1.0f, guidevec1, guidevec2, NULL, NULL, NULL);
                        UI_ThemeColorBlend(curcol, TH_BACK, 0.5);
                        drawcircball(GL_LINE_LOOP, guidevec1, mindist, imat);
 
                        /*path beginning*/
                        setlinestyle(0);
-                       where_on_path(ob, 0.0f, guidevec1, guidevec2, NULL, NULL);
+                       where_on_path(ob, 0.0f, guidevec1, guidevec2, NULL, NULL, NULL);
                        UI_ThemeColorBlend(curcol, TH_BACK, 0.5);
                        drawcircball(GL_LINE_LOOP, guidevec1, mindist, imat);
                        
@@ -5252,8 +5359,15 @@ static void drawSolidSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
        if(ELEM3(ob->type, OB_FONT,OB_CURVE, OB_SURF)) {
                Curve *cu = ob->data;
                DerivedMesh *dm = ob->derivedFinal;
+               int hasfaces= 0;
+
+               if (dm) {
+                       hasfaces= dm->getNumFaces(dm);
+               } else {
+                       hasfaces= displist_has_faces(&cu->disp);
+               }
 
-               if (displist_has_faces(&cu->disp) && boundbox_clip(rv3d, ob->obmat, ob->bb ? ob->bb : cu->bb)) {
+               if (hasfaces && boundbox_clip(rv3d, ob->obmat, ob->bb ? ob->bb : cu->bb)) {
                        draw_index_wire= 0;
                        if (dm) {
                                draw_mesh_object_outline(v3d, ob, dm);
@@ -5728,8 +5842,10 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                                        set_inverted_drawing(0);
                                }
                        }
-                       else if(dt==OB_BOUNDBOX) 
-                               draw_bounding_volume(scene, ob);
+                       else if(dt==OB_BOUNDBOX) {
+                               if((v3d->flag2 & V3D_RENDER_OVERRIDE && v3d->drawtype >= OB_WIRE)==0)
+                                       draw_bounding_volume(scene, ob);
+                       }
                        else if(boundbox_clip(rv3d, ob->obmat, ob->bb ? ob->bb : cu->bb))
                                empty_object= drawDispList(scene, v3d, rv3d, base, dt);
 
@@ -5741,8 +5857,10 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                        if(cu->editnurb) {
                                drawnurb(scene, v3d, rv3d, base, cu->editnurb->first, dt);
                        }
-                       else if(dt==OB_BOUNDBOX) 
-                               draw_bounding_volume(scene, ob);
+                       else if(dt==OB_BOUNDBOX) {
+                               if((v3d->flag2 & V3D_RENDER_OVERRIDE && v3d->drawtype >= OB_WIRE)==0)
+                                       draw_bounding_volume(scene, ob);
+                       }
                        else if(boundbox_clip(rv3d, ob->obmat, ob->bb ? ob->bb : cu->bb)) {
                                empty_object= drawDispList(scene, v3d, rv3d, base, dt);
                                
@@ -5756,15 +5874,17 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                        
                        if(mb->editelems) 
                                drawmball(scene, v3d, rv3d, base, dt);
-                       else if(dt==OB_BOUNDBOX) 
-                               draw_bounding_volume(scene, ob);
+                       else if(dt==OB_BOUNDBOX) {
+                               if((v3d->flag2 & V3D_RENDER_OVERRIDE && v3d->drawtype >= OB_WIRE)==0)
+                                       draw_bounding_volume(scene, ob);
+                       }
                        else 
                                empty_object= drawmball(scene, v3d, rv3d, base, dt);
                        break;
                }
                case OB_EMPTY:
                        if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0)
-                               drawaxes(ob->empty_drawsize, flag, ob->empty_drawtype);
+                               drawaxes(rv3d, rv3d->viewmatob, ob->empty_drawsize, flag, ob->empty_drawtype);
                        break;
                case OB_LAMP:
                        if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
@@ -5790,11 +5910,11 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                        break;
                default:
                        if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
-                               drawaxes(1.0, flag, OB_ARROWS);
+                               drawaxes(rv3d, rv3d->viewmatob, 1.0, flag, OB_ARROWS);
                        }
        }
 
-               if((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
+       if((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
 
                if(ob->soft /*&& flag & OB_SBMOTION*/){
                        float mrt[3][3],msc[3][3],mtr[3][3]; 
@@ -5813,10 +5933,10 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                        }
                }
 
-        if(ob->pd && ob->pd->forcefield) {
-            draw_forcefield(scene, ob, rv3d);
-        }
-    }
+               if(ob->pd && ob->pd->forcefield) {
+                       draw_forcefield(scene, ob, rv3d);
+               }
+       }
 
        /* code for new particle system */
        if(             (warning_recursive==0) &&
@@ -5973,7 +6093,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                }
        }
 
-    if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
+       if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
 
                bConstraint *con;
                for(con=ob->constraints.first; con; con= con->next) 
@@ -5986,24 +6106,27 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                        }
                }
 
-        /* draw extra: after normal draw because of makeDispList */
-        if(dtx && (G.f & G_RENDER_OGL)==0) {
+               /* draw extra: after normal draw because of makeDispList */
+               if(dtx && (G.f & G_RENDER_OGL)==0) {
         
-            if(dtx & OB_AXIS) {
-                drawaxes(1.0f, flag, OB_ARROWS);
-            }
-            if(dtx & OB_BOUNDBOX) draw_bounding_volume(scene, ob);
-            if(dtx & OB_TEXSPACE) drawtexspace(ob);
-            if(dtx & OB_DRAWNAME) {
-                /* patch for several 3d cards (IBM mostly) that crash on glSelect with text drawing */
-                /* but, we also dont draw names for sets or duplicators */
-                if(flag == 0) {
-                    view3d_cached_text_draw_add(0.0f, 0.0f, 0.0f, ob->id.name+2, 10, 0);
-                }
-            }
-            /*if(dtx & OB_DRAWIMAGE) drawDispListwire(&ob->disp);*/
-            if((dtx & OB_DRAWWIRE) && dt>=OB_SOLID) drawWireExtra(scene, rv3d, ob);
-        }
+                       if(dtx & OB_AXIS) {
+                               drawaxes(rv3d, rv3d->viewmatob, 1.0f, flag, OB_ARROWS);
+                       }
+                       if(dtx & OB_BOUNDBOX) {
+                               if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0)
+                                       draw_bounding_volume(scene, ob);
+                       }
+                       if(dtx & OB_TEXSPACE) drawtexspace(ob);
+                       if(dtx & OB_DRAWNAME) {
+                               /* patch for several 3d cards (IBM mostly) that crash on glSelect with text drawing */
+                               /* but, we also dont draw names for sets or duplicators */
+                               if(flag == 0) {
+                                       view3d_cached_text_draw_add(0.0f, 0.0f, 0.0f, ob->id.name+2, 10, 0);
+                               }
+                       }
+                       /*if(dtx & OB_DRAWIMAGE) drawDispListwire(&ob->disp);*/
+                       if((dtx & OB_DRAWWIRE) && dt>=OB_SOLID) drawWireExtra(scene, rv3d, ob);
+               }
        }
 
        if(dt<OB_SHADED) {
@@ -6054,8 +6177,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                        else if((flag & DRAW_CONSTCOLOR)==0) {
                                /* we don't draw centers for duplicators and sets */
                                if(U.obcenter_dia > 0) {
-                    /* check > 0 otherwise grease pencil can draw into the circle select which is annoying. */
-                    drawcentercircle(v3d, rv3d, ob->obmat[3], do_draw_center, ob->id.lib || ob->id.us>1);
+                                       /* check > 0 otherwise grease pencil can draw into the circle select which is annoying. */
+                                       drawcentercircle(v3d, rv3d, ob->obmat[3], do_draw_center, ob->id.lib || ob->id.us>1);
                                }
                        }
                }
@@ -6195,7 +6318,7 @@ static void bbs_mesh_solid_EM(Scene *scene, View3D *v3d, Object *ob, DerivedMesh
        if (facecol) {
                dm->drawMappedFaces(dm, bbs_mesh_solid__setSolidDrawOptions, (void*)(intptr_t) 1, 0);
 
-               if( CHECK_OB_DRAWFACEDOT(scene, v3d, ob->dt) ) {
+               if(check_ob_drawface_dot(scene, v3d, ob->dt)) {
                        glPointSize(UI_GetThemeValuef(TH_FACEDOT_SIZE));
                
                        bglBegin(GL_POINTS);
@@ -6315,9 +6438,9 @@ static void draw_object_mesh_instance(Scene *scene, View3D *v3d, RegionView3D *r
 
        if(dt<=OB_WIRE) {
                if(dm)
-                       dm->drawEdges(dm, 1);
+                       dm->drawEdges(dm, 1, 0);
                else if(edm)
-                       edm->drawEdges(edm, 1); 
+                       edm->drawEdges(edm, 1, 0);      
        }
        else {
                if(outline)
@@ -6361,7 +6484,7 @@ void draw_object_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object
                        draw_object_mesh_instance(scene, v3d, rv3d, ob, dt, outline);
                        break;
                case OB_EMPTY:
-                       drawaxes(ob->empty_drawsize, 0, ob->empty_drawtype);
+                       drawaxes(rv3d, rv3d->viewmatob, ob->empty_drawsize, 0, ob->empty_drawtype);
                        break;
        }
 }