- added GCC warning -Wstrict-prototypes
[blender.git] / source / blender / editors / space_view3d / drawobject.c
index 532b4ce0771175e82f98d5ac23a275969c4c1b71..65b621b1d7a3928289abedb1fa114e05d9d1f8ee 100644 (file)
 #include "BLI_rand.h"
 
 #include "BKE_anim.h"                  //for the where_on_path function
-#include "BKE_curve.h"
 #include "BKE_constraint.h" // for the get_constraint_target function
 #include "BKE_DerivedMesh.h"
 #include "BKE_deform.h"
 #include "BKE_displist.h"
-#include "BKE_effect.h"
 #include "BKE_font.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
@@ -68,9 +66,6 @@
 #include "BKE_paint.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
-#include "BKE_property.h"
-#include "BKE_softbody.h"
-#include "BKE_smoke.h"
 #include "BKE_unit.h"
 #include "BKE_utildefines.h"
 #include "smoke_API.h"
@@ -86,6 +81,7 @@
 #include "ED_screen.h"
 #include "ED_sculpt.h"
 #include "ED_types.h"
+#include "ED_curve.h" /* for ED_curve_editnurbs */
 
 #include "UI_resources.h"
 
@@ -145,7 +141,7 @@ static void view3d_project_short_clip(ARegion *ar, float *vec, short *adr, int l
                        return;
        }
        
-       VECCOPY(vec4, vec);
+       copy_v3_v3(vec4, vec);
        vec4[3]= 1.0;
        
        mul_m4_v4(rv3d->persmatob, vec4);
@@ -174,7 +170,7 @@ static void view3d_project_short_noclip(ARegion *ar, float *vec, short *adr)
        
        adr[0]= IS_CLIPPED;
        
-       VECCOPY(vec4, vec);
+       copy_v3_v3(vec4, vec);
        vec4[3]= 1.0;
        
        mul_m4_v4(rv3d->persmatob, vec4);
@@ -320,30 +316,15 @@ static float cosval[32] ={
        1.00000000
 };
 
-static void draw_xyz_wire(RegionView3D *rv3d, float mat[][4], float *c, float size, int axis)
+static void draw_xyz_wire(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;
+       float dim = size * 0.1;
+       float dx[3], dy[3], dz[3];
 
-       /* 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);
+       dx[0]=dim; dx[1]=0.f; dx[2]=0.f;
+       dy[0]=0.f; dy[1]=dim; dy[2]=0.f;
+       dz[0]=0.f; dz[1]=0.f; dz[2]=dim;
 
        switch(axis) {
                case 0:         /* x axis */
@@ -396,7 +377,7 @@ static void draw_xyz_wire(RegionView3D *rv3d, float mat[][4], float *c, float si
                        
                        /* start at top left */
                        sub_v3_v3v3(v1, c, dx);
-                       add_v3_v3v3(v1, c, dy);
+                       add_v3_v3v3(v1, c, dz);
                        
                        glVertex3fv(v1);
                        
@@ -405,9 +386,9 @@ static void draw_xyz_wire(RegionView3D *rv3d, float mat[][4], float *c, float si
 
                        glVertex3fv(v1);
                        
-                       mul_v3_fl(dy, 2.f);
+                       mul_v3_fl(dz, 2.f);
                        sub_v3_v3(v1, dx);
-                       sub_v3_v3(v1, dy);
+                       sub_v3_v3(v1, dz);
                        
                        glVertex3fv(v1);
                        
@@ -421,8 +402,7 @@ static void draw_xyz_wire(RegionView3D *rv3d, float mat[][4], float *c, float si
        
 }
 
-/* flag is same as for draw_object */
-void drawaxes(RegionView3D *rv3d, float mat[][4], float size, int flag, char drawtype)
+void drawaxes(float size, char drawtype)
 {
        int axis;
        float v1[3]= {0.0, 0.0, 0.0};
@@ -433,9 +413,6 @@ void drawaxes(RegionView3D *rv3d, float mat[][4], float size, int flag, char dra
        
        case OB_PLAINAXES:
                for (axis=0; axis<3; axis++) {
-                       float v1[3]= {0.0, 0.0, 0.0};
-                       float v2[3]= {0.0, 0.0, 0.0};
-                       
                        glBegin(GL_LINES);
                        
                        v1[axis]= size;
@@ -464,11 +441,11 @@ void drawaxes(RegionView3D *rv3d, float mat[][4], float size, int flag, char dra
                
                for (axis=0; axis<4; axis++) {
                        if (axis % 2 == 1) {
-                               v2[0] *= -1;
-                               v3[1] *= -1;
+                               v2[0] = -v2[0];
+                               v3[1] = -v3[1];
                        } else {
-                               v2[1] *= -1;
-                               v3[0] *= -1;
+                               v2[1] = -v2[1];
+                               v3[0] = -v3[0];
                        }
                        
                        glVertex3fv(v1);
@@ -498,8 +475,6 @@ void drawaxes(RegionView3D *rv3d, float mat[][4], float size, int flag, char dra
        case OB_ARROWS:
        default:
                for (axis=0; axis<3; axis++) {
-                       float v1[3]= {0.0, 0.0, 0.0};
-                       float v2[3]= {0.0, 0.0, 0.0};
                        int arrow_axis= (axis==0)?1:0;
                        
                        glBegin(GL_LINES);
@@ -521,7 +496,7 @@ void drawaxes(RegionView3D *rv3d, float mat[][4], float size, int flag, char dra
                                
                        v2[axis]+= size*0.125;
                        
-                       draw_xyz_wire(rv3d, mat, v2, size, axis);
+                       draw_xyz_wire(v2, size, axis);
                }
                break;
        }
@@ -531,12 +506,10 @@ void drawcircball(int mode, float *cent, float rad, float tmat[][4])
 {
        float vec[3], vx[3], vy[3];
        int a, tot=32;
-       
-       VECCOPY(vx, tmat[0]);
-       VECCOPY(vy, tmat[1]);
-       mul_v3_fl(vx, rad);
-       mul_v3_fl(vy, rad);
-       
+
+       mul_v3_v3fl(vx, tmat[0], rad);
+       mul_v3_v3fl(vy, tmat[1], rad);
+
        glBegin(mode);
        for(a=0; a<tot; a++) {
                vec[0]= cent[0] + *(sinval+a) * vx[0] + *(cosval+a) * vy[0];
@@ -548,12 +521,9 @@ void drawcircball(int mode, float *cent, float rad, float tmat[][4])
 }
 
 /* circle for object centers, special_color is for library or ob users */
-static void drawcentercircle(View3D *v3d, RegionView3D *rv3d, float *vec, int selstate, int special_color)
+static void drawcentercircle(View3D *v3d, RegionView3D *rv3d, float *co, int selstate, int special_color)
 {
-       float size;
-       
-       size= rv3d->persmat[0][3]*vec[0]+ rv3d->persmat[1][3]*vec[1]+ rv3d->persmat[2][3]*vec[2]+ rv3d->persmat[3][3];
-       size*= rv3d->pixsize*((float)U.obcenter_dia*0.5f);
+       const float size= view3d_pixel_size(rv3d, co) * (float)U.obcenter_dia * 0.5f;
 
        /* using gldepthfunc guarantees that it does write z values, but not checks for it, so centers remain visible independt order of drawing */
        if(v3d->zbuf)  glDepthFunc(GL_ALWAYS);
@@ -569,10 +539,10 @@ static void drawcentercircle(View3D *v3d, RegionView3D *rv3d, float *vec, int se
                else if (selstate == SELECT) UI_ThemeColorShadeAlpha(TH_SELECT, 0, -80);
                else if (selstate == DESELECT) UI_ThemeColorShadeAlpha(TH_TRANSFORM, 0, -80);
        }
-       drawcircball(GL_POLYGON, vec, size, rv3d->viewinv);
+       drawcircball(GL_POLYGON, co, size, rv3d->viewinv);
        
        UI_ThemeColorShadeAlpha(TH_WIRE, 0, -30);
-       drawcircball(GL_LINE_LOOP, vec, size, rv3d->viewinv);
+       drawcircball(GL_LINE_LOOP, co, size, rv3d->viewinv);
        
        glDisable(GL_BLEND);
        if(v3d->zbuf)  glDepthFunc(GL_LEQUAL);
@@ -585,10 +555,10 @@ static int CachedTextLevel= 0;
 typedef struct ViewCachedString {
        struct ViewCachedString *next, *prev;
        float vec[3], col[4];
-       char str[128]; 
        short mval[2];
        short xoffs;
        short flag;
+       /* str is allocated past the end */
 } ViewCachedString;
 
 void view3d_cached_text_draw_begin()
@@ -598,19 +568,20 @@ void view3d_cached_text_draw_begin()
        CachedTextLevel++;
 }
 
-void view3d_cached_text_draw_add(float x, float y, float z, char *str, short xoffs, short flag)
+void view3d_cached_text_draw_add(const float co[3], const char *str, short xoffs, short flag)
 {
+       int alloc_len= strlen(str) + 1;
        ListBase *strings= &CachedText[CachedTextLevel-1];
-       ViewCachedString *vos= MEM_callocN(sizeof(ViewCachedString), "ViewCachedString");
+       ViewCachedString *vos= MEM_callocN(sizeof(ViewCachedString) + alloc_len, "ViewCachedString");
 
        BLI_addtail(strings, vos);
-       BLI_strncpy(vos->str, str, 128);
-       vos->vec[0]= x;
-       vos->vec[1]= y;
-       vos->vec[2]= z;
+       copy_v3_v3(vos->vec, co);
        glGetFloatv(GL_CURRENT_COLOR, vos->col);
        vos->xoffs= xoffs;
        vos->flag= flag;
+
+       /* allocate past the end */
+       memcpy(++vos, str, alloc_len);
 }
 
 void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, int depth_write, float mat[][4])
@@ -664,8 +635,14 @@ void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, int depth_write, floa
                        }
 #endif
                        if(vos->mval[0]!=IS_CLIPPED) {
+                               const char *str= (char *)(vos+1);
                                glColor3fv(vos->col);
-                               BLF_draw_default((float)vos->mval[0]+vos->xoffs, (float)vos->mval[1], (depth_write)? 0.0f: 2.0f, vos->str);
+                               if(vos->flag & V3D_CACHE_TEXT_ASCII) {
+                                       BLF_draw_default_ascii((float)vos->mval[0]+vos->xoffs, (float)vos->mval[1], (depth_write)? 0.0f: 2.0f, str, 65535); /* XXX, use real length */
+                               }
+                               else {
+                                       BLF_draw_default((float)vos->mval[0]+vos->xoffs, (float)vos->mval[1], (depth_write)? 0.0f: 2.0f, str, 65535); /* XXX, use real length */
+                               }
                        }
                }
                
@@ -776,14 +753,8 @@ static void drawshadbuflimits(Lamp *la, float mat[][4])
        negate_v3_v3(lavec, mat[2]);
        normalize_v3(lavec);
 
-       sta[0]= mat[3][0]+ la->clipsta*lavec[0];
-       sta[1]= mat[3][1]+ la->clipsta*lavec[1];
-       sta[2]= mat[3][2]+ la->clipsta*lavec[2];
-
-       end[0]= mat[3][0]+ la->clipend*lavec[0];
-       end[1]= mat[3][1]+ la->clipend*lavec[1];
-       end[2]= mat[3][2]+ la->clipend*lavec[2];
-
+       madd_v3_v3v3fl(sta, mat[3], lavec, la->clipsta);
+       madd_v3_v3v3fl(end, mat[3], lavec, la->clipend);
 
        glBegin(GL_LINE_STRIP);
                glVertex3fv(sta);
@@ -838,10 +809,7 @@ static void spotvolume(float *lvec, float *vvec, float inp)
        quat_to_mat3(mat1,q);
 
        /* rotate lamp vector now over acos(inp) degrees */
-
-       vvec[0] = lvec[0] ; 
-       vvec[1] = lvec[1] ; 
-       vvec[2] = lvec[2] ;
+       copy_v3_v3(vvec, lvec);
 
        unit_m3(mat2);
        co = inp;
@@ -907,7 +875,7 @@ static void draw_transp_spot_volume(Lamp *la, float x, float z)
 
        draw_spot_cone(la, x, z);
 
-       /* draw front side lightening */
+       /* draw front side lighting */
        glCullFace(GL_BACK);
 
        glBlendFunc(GL_ONE,  GL_ONE); 
@@ -926,16 +894,17 @@ static void draw_transp_spot_volume(Lamp *la, float x, float z)
 static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, int dt, int flag)
 {
        Object *ob= base->object;
+       const float pixsize= view3d_pixel_size(rv3d, ob->obmat[3]);
        Lamp *la= ob->data;
        float vec[3], lvec[3], vvec[3], circrad, x,y,z;
-       float pixsize, lampsize;
+       float lampsize;
        float imat[4][4], curcol[4];
        char col[4];
        int drawcone= (dt>OB_WIRE && !(G.f & G_PICKSEL) && la->type == LA_SPOT && (la->mode & LA_SHOW_CONE));
        
        if(drawcone && !v3d->transp) {
                /* in this case we need to draw delayed */
-               add_view3d_after(v3d, base, V3D_TRANSP, flag);
+               add_view3d_after(&v3d->afterdraw_transp, base, flag);
                return;
        }
        
@@ -944,14 +913,15 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
        glLoadMatrixf(rv3d->viewmat);
 
        /* lets calculate the scale: */
-       pixsize= rv3d->persmat[0][3]*ob->obmat[3][0]+ rv3d->persmat[1][3]*ob->obmat[3][1]+ rv3d->persmat[2][3]*ob->obmat[3][2]+ rv3d->persmat[3][3];
-       pixsize*= rv3d->pixsize;
        lampsize= pixsize*((float)U.obcenter_dia*0.5f);
 
        /* and view aligned matrix: */
        copy_m4_m4(imat, rv3d->viewinv);
        normalize_v3(imat[0]);
        normalize_v3(imat[1]);
+
+       /* lamp center */
+       copy_v3_v3(vec, ob->obmat[3]);
        
        /* for AA effects */
        glGetFloatv(GL_CURRENT_COLOR, curcol);
@@ -966,7 +936,6 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
                }
                
                /* Inner Circle */
-               VECCOPY(vec, ob->obmat[3]);
                glEnable(GL_BLEND);
                drawcircball(GL_LINE_LOOP, vec, lampsize, imat);
                glDisable(GL_BLEND);
@@ -1005,10 +974,8 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
                vec_rot_to_mat3( mat,imat[2], M_PI/4.0f);
                
                /* vectors */
-               VECCOPY(v1, imat[0]);
-               mul_v3_fl(v1, circrad*1.2f);
-               VECCOPY(v2, imat[0]);
-               mul_v3_fl(v2, circrad*2.5f);
+               mul_v3_v3fl(v1, imat[0], circrad * 1.2f);
+               mul_v3_v3fl(v2, imat[0], circrad * 2.5f);
                
                /* center */
                glTranslatef(vec[0], vec[1], vec[2]);
@@ -1036,7 +1003,7 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
        }
        
        glPopMatrix();  /* back in object space */
-       vec[0]= vec[1]= vec[2]= 0.0f;
+       zero_v3(vec);
        
        if ((la->type==LA_SPOT) || (la->type==LA_YF_PHOTON)) {  
                lvec[0]=lvec[1]= 0.0; 
@@ -1128,7 +1095,7 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
                        /* draw the hemisphere curves */
                        short axis, steps, dir;
                        float outdist, zdist, mul;
-                       vec[0]=vec[1]=vec[2]= 0.0;
+                       zero_v3(vec);
                        outdist = 0.14; mul = 1.4; dir = 1;
                        
                        setlinestyle(4);
@@ -1177,7 +1144,7 @@ static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
        
        /* and back to viewspace */
        glLoadMatrixf(rv3d->viewmat);
-       VECCOPY(vec, ob->obmat[3]);
+       copy_v3_v3(vec, ob->obmat[3]);
 
        setlinestyle(0);
        
@@ -1246,45 +1213,71 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob
 {
        /* a standing up pyramid with (0,0,0) as top */
        Camera *cam;
-       World *wrld;
-       float nobmat[4][4], vec[8][4], fac, facx, facy, depth;
+       float vec[8][4], facx, facy, depth, aspx, aspy, caspx, caspy, shx, shy;
        int i;
+       float drawsize;
+       const short is_view= (rv3d->persp==RV3D_CAMOB && ob==v3d->camera);
 
+       const float scax= 1.0f / len_v3(ob->obmat[0]);
+       const float scay= 1.0f / len_v3(ob->obmat[1]);
+       const float scaz= 1.0f / len_v3(ob->obmat[2]);
+       
        cam= ob->data;
+       aspx= (float) scene->r.xsch*scene->r.xasp;
+       aspy= (float) scene->r.ysch*scene->r.yasp;
+
+       if(aspx < aspy) {
+               caspx= aspx / aspy;
+               caspy= 1.0;
+       }
+       else {
+               caspx= 1.0;
+               caspy= aspy / aspx;
+       }
        
        glDisable(GL_LIGHTING);
        glDisable(GL_CULL_FACE);
        
-       if(rv3d->persp>=2 && cam->type==CAM_ORTHO && ob==v3d->camera) {
-               facx= 0.5*cam->ortho_scale*1.28;
-               facy= 0.5*cam->ortho_scale*1.024;
-               depth= -cam->clipsta-0.1;
+       if(cam->type==CAM_ORTHO) {
+               facx= 0.5f * cam->ortho_scale * caspx * scax;
+               facy= 0.5f * cam->ortho_scale * caspy * scay;
+               shx= cam->shiftx * cam->ortho_scale * scax;
+               shy= cam->shifty * cam->ortho_scale * scay;
+               depth= is_view ? -((cam->clipsta * scaz) + 0.1f) : - cam->drawsize * cam->ortho_scale * scaz;
+               
+               drawsize= 0.5f * cam->ortho_scale;
        }
        else {
-               fac= cam->drawsize;
-               if(rv3d->persp>=2 && ob==v3d->camera) fac= cam->clipsta+0.1; /* that way it's always visible */
+               /* that way it's always visible - clipsta+0.1 */
+               float fac;
+               drawsize= cam->drawsize / ((scax + scay + scaz) / 3.0f);
+               fac= is_view ? (cam->clipsta + 0.1f) : drawsize;
+               depth= - fac*cam->lens/16.0 * scaz;
+               facx= fac * caspx * scax;
+               facy= fac * caspy * scay;
+               shx= cam->shiftx*fac*2 * scax;
+               shy= cam->shifty*fac*2 * scay;
                
-               depth= - fac*cam->lens/16.0;
-               facx= fac*1.28;
-               facy= fac*1.024;
        }
        
-       vec[0][0]= 0.0; vec[0][1]= 0.0; vec[0][2]= 0.001;       /* GLBUG: for picking at iris Entry (well thats old!) */
-       vec[1][0]= facx; vec[1][1]= facy; vec[1][2]= depth;
-       vec[2][0]= facx; vec[2][1]= -facy; vec[2][2]= depth;
-       vec[3][0]= -facx; vec[3][1]= -facy; vec[3][2]= depth;
-       vec[4][0]= -facx; vec[4][1]= facy; vec[4][2]= depth;
+       vec[0][0]= 0.0; vec[0][1]= 0.0; vec[0][2]= 0.0;
+       vec[1][0]= shx + facx; vec[1][1]= shy + facy; vec[1][2]= depth;
+       vec[2][0]= shx + facx; vec[2][1]= shy - facy; vec[2][2]= depth;
+       vec[3][0]= shx - facx; vec[3][1]= shy - facy; vec[3][2]= depth;
+       vec[4][0]= shx - facx; vec[4][1]= shy + facy; vec[4][2]= depth;
 
+       /* camera frame */
        glBegin(GL_LINE_LOOP);
                glVertex3fv(vec[1]); 
                glVertex3fv(vec[2]); 
                glVertex3fv(vec[3]); 
                glVertex3fv(vec[4]);
        glEnd();
-       
 
-       if(rv3d->persp>=2 && ob==v3d->camera) return;
-       
+       if(is_view)
+               return;
+
+       /* center point to camera frame */
        glBegin(GL_LINE_STRIP);
                glVertex3fv(vec[2]); 
                glVertex3fv(vec[0]);
@@ -1298,7 +1291,7 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob
        /* arrow on top */
        vec[0][2]= depth;
 
-       
+
        /* draw an outline arrow for inactive cameras and filled
         * for active cameras. We actually draw both outline+filled
         * for active cameras so the wire can be seen side-on */        
@@ -1306,24 +1299,26 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob
                if (i==0) glBegin(GL_LINE_LOOP);
                else if (i==1 && (ob == v3d->camera)) glBegin(GL_TRIANGLES);
                else break;
+
+               vec[0][0]= shx + ((-0.7 * drawsize) * scax);
+               vec[0][1]= shy + ((drawsize * (caspy + 0.1)) * scay);
+               glVertex3fv(vec[0]); /* left */
                
-               vec[0][0]= -0.7*cam->drawsize;
-               vec[0][1]= 1.1*cam->drawsize;
-               glVertex3fv(vec[0]);
-               
-               vec[0][0]= 0.0; 
-               vec[0][1]= 1.8*cam->drawsize;
-               glVertex3fv(vec[0]);
+               vec[0][0]= shx + ((0.7 * drawsize) * scax);
+               glVertex3fv(vec[0]); /* right */
                
-               vec[0][0]= 0.7*cam->drawsize; 
-               vec[0][1]= 1.1*cam->drawsize;
-               glVertex3fv(vec[0]);
+               vec[0][0]= shx;
+               vec[0][1]= shy + ((1.1 * drawsize * (caspy + 0.7)) * scay);
+               glVertex3fv(vec[0]); /* top */
        
                glEnd();
        }
 
        if(flag==0) {
                if(cam->flag & (CAM_SHOWLIMITS+CAM_SHOWMIST)) {
+                       float nobmat[4][4];
+                       World *wrld;
+       
                        /* draw in normalized object matrix space */
                        copy_m4_m4(nobmat, ob->obmat);
                        normalize_m4(nobmat);
@@ -1382,10 +1377,10 @@ void lattice_foreachScreenVert(ViewContext *vc, void (*func)(void *userData, BPo
 {
        Object *obedit= vc->obedit;
        Lattice *lt= obedit->data;
-       BPoint *bp = lt->editlatt->def;
+       BPoint *bp = lt->editlatt->latt->def;
        DispList *dl = find_displist(&obedit->disp, DL_VERTS);
        float *co = dl?dl->verts:NULL;
-       int i, N = lt->editlatt->pntsu*lt->editlatt->pntsv*lt->editlatt->pntsw;
+       int i, N = lt->editlatt->latt->pntsu*lt->editlatt->latt->pntsv*lt->editlatt->latt->pntsw;
        short s[2] = {IS_CLIPPED, 0};
 
        ED_view3d_local_clipping(vc->rv3d, obedit->obmat); /* for local clipping lookups */
@@ -1433,7 +1428,7 @@ static void drawlattice(Scene *scene, View3D *v3d, Object *ob)
        dl= find_displist(&ob->disp, DL_VERTS);
        
        if(is_edit) {
-               lt= lt->editlatt;
+               lt= lt->editlatt->latt;
 
                cpack(0x004000);
                
@@ -1488,7 +1483,7 @@ static void drawlattice(Scene *scene, View3D *v3d, Object *ob)
  * if not, ED_view3d_init_mats_rv3d() can be used for selection tools
  * but would not give correct results with dupli's for eg. which dont
  * use the object matrix in the useual way */
-static void mesh_foreachScreenVert__mapFunc(void *userData, int index, float *co, float *no_f, short *no_s)
+static void mesh_foreachScreenVert__mapFunc(void *userData, int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s))
 {
        struct { void (*func)(void *userData, EditVert *eve, int x, int y, int index); void *userData; ViewContext vc; int clipVerts; } *data = userData;
        EditVert *eve = EM_get_vert_for_index(index);
@@ -1572,7 +1567,7 @@ void mesh_foreachScreenEdge(ViewContext *vc, void (*func)(void *userData, EditEd
        dm->release(dm);
 }
 
-static void mesh_foreachScreenFace__mapFunc(void *userData, int index, float *cent, float *no)
+static void mesh_foreachScreenFace__mapFunc(void *userData, int index, float *cent, float *UNUSED(no))
 {
        struct { void (*func)(void *userData, EditFace *efa, int x, int y, int index); void *userData; ViewContext vc; } *data = userData;
        EditFace *efa = EM_get_face_for_index(index);
@@ -1610,10 +1605,11 @@ void nurbs_foreachScreenVert(ViewContext *vc, void (*func)(void *userData, Nurb
        short s[2] = {IS_CLIPPED, 0};
        Nurb *nu;
        int i;
+       ListBase *nurbs= ED_curve_editnurbs(cu);
 
        ED_view3d_local_clipping(vc->rv3d, vc->obedit->obmat); /* for local clipping lookups */
 
-       for (nu= cu->editnurb->first; nu; nu=nu->next) {
+       for (nu= nurbs->first; nu; nu=nu->next) {
                if(nu->type == CU_BEZIER) {
                        for (i=0; i<nu->pntsu; i++) {
                                BezTriple *bezt = &nu->bezt[i];
@@ -1682,7 +1678,7 @@ static void draw_dm_face_normals(Scene *scene, DerivedMesh *dm)
        glEnd();
 }
 
-static void draw_dm_face_centers__mapFunc(void *userData, int index, float *cent, float *no)
+static void draw_dm_face_centers__mapFunc(void *userData, int index, float *cent, float *UNUSED(no))
 {
        EditFace *efa = EM_get_face_for_index(index);
        int sel = *((int*) userData);
@@ -1726,7 +1722,7 @@ static void draw_dm_vert_normals(Scene *scene, DerivedMesh *dm)
 }
 
        /* Draw verts with color set based on selection */
-static void draw_dm_verts__mapFunc(void *userData, int index, float *co, float *no_f, short *no_s)
+static void draw_dm_verts__mapFunc(void *userData, int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s))
 {
        struct { int sel; EditVert *eve_act; } * data = userData;
        EditVert *eve = EM_get_vert_for_index(index);
@@ -1803,7 +1799,7 @@ static void draw_dm_edges_sel(DerivedMesh *dm, unsigned char *baseCol, unsigned
 }
 
        /* Draw edges */
-static int draw_dm_edges__setDrawOptions(void *userData, int index)
+static int draw_dm_edges__setDrawOptions(void *UNUSED(userData), int index)
 {
        return EM_get_edge_for_index(index)->h==0;
 }
@@ -1813,7 +1809,7 @@ static void draw_dm_edges(DerivedMesh *dm)
 }
 
        /* Draw edges with color interpolated based on selection */
-static int draw_dm_edges_sel_interp__setDrawOptions(void *userData, int index)
+static int draw_dm_edges_sel_interp__setDrawOptions(void *UNUSED(userData), int index)
 {
        return EM_get_edge_for_index(index)->h==0;
 }
@@ -1832,13 +1828,14 @@ static void draw_dm_edges_sel_interp__setDrawInterpOptions(void *userData, int i
 
 static void draw_dm_edges_sel_interp(DerivedMesh *dm, unsigned char *baseCol, unsigned char *selCol)
 {
-       unsigned char *cols[2] = {baseCol, selCol};
-
+       unsigned char *cols[2];
+       cols[0]= baseCol;
+       cols[1]= selCol;
        dm->drawMappedEdgesInterp(dm, draw_dm_edges_sel_interp__setDrawOptions, draw_dm_edges_sel_interp__setDrawInterpOptions, cols);
 }
 
        /* Draw only seam edges */
-static int draw_dm_edges_seams__setDrawOptions(void *userData, int index)
+static int draw_dm_edges_seams__setDrawOptions(void *UNUSED(userData), int index)
 {
        EditEdge *eed = EM_get_edge_for_index(index);
 
@@ -1850,7 +1847,7 @@ static void draw_dm_edges_seams(DerivedMesh *dm)
 }
 
        /* Draw only sharp edges */
-static int draw_dm_edges_sharp__setDrawOptions(void *userData, int index)
+static int draw_dm_edges_sharp__setDrawOptions(void *UNUSED(userData), int index)
 {
        EditEdge *eed = EM_get_edge_for_index(index);
 
@@ -1864,7 +1861,7 @@ static void draw_dm_edges_sharp(DerivedMesh *dm)
 
        /* Draw faces with color set based on selection
         * return 2 for the active face so it renders with stipple enabled */
-static int draw_dm_faces_sel__setDrawOptions(void *userData, int index, int *drawSmooth_r)
+static int draw_dm_faces_sel__setDrawOptions(void *userData, int index, int *UNUSED(drawSmooth_r))
 {
        struct { unsigned char *cols[3]; EditFace *efa_act; } * data = userData;
        EditFace *efa = EM_get_face_for_index(index);
@@ -1893,10 +1890,10 @@ static void draw_dm_faces_sel(DerivedMesh *dm, unsigned char *baseCol, unsigned
        data.cols[2] = actCol;
        data.efa_act = efa_act;
 
-       dm->drawMappedFaces(dm, draw_dm_faces_sel__setDrawOptions, &data, 0);
+       dm->drawMappedFaces(dm, draw_dm_faces_sel__setDrawOptions, &data, 0, GPU_enable_material);
 }
 
-static int draw_dm_creases__setDrawOptions(void *userData, int index)
+static int draw_dm_creases__setDrawOptions(void *UNUSED(userData), int index)
 {
        EditEdge *eed = EM_get_edge_for_index(index);
 
@@ -1914,7 +1911,7 @@ static void draw_dm_creases(DerivedMesh *dm)
        glLineWidth(1.0);
 }
 
-static int draw_dm_bweights__setDrawOptions(void *userData, int index)
+static int draw_dm_bweights__setDrawOptions(void *UNUSED(userData), int index)
 {
        EditEdge *eed = EM_get_edge_for_index(index);
 
@@ -1925,7 +1922,7 @@ static int draw_dm_bweights__setDrawOptions(void *userData, int index)
                return 0;
        }
 }
-static void draw_dm_bweights__mapFunc(void *userData, int index, float *co, float *no_f, short *no_s)
+static void draw_dm_bweights__mapFunc(void *UNUSED(userData), int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s))
 {
        EditVert *eve = EM_get_vert_for_index(index);
 
@@ -1960,7 +1957,7 @@ static void draw_dm_bweights(Scene *scene, DerivedMesh *dm)
 
 /* EditMesh drawing routines*/
 
-static void draw_em_fancy_verts(Scene *scene, View3D *v3d, Object *obedit, EditMesh *em, DerivedMesh *cageDM, EditVert *eve_act)
+static void draw_em_fancy_verts(Scene *scene, View3D *v3d, Object *obedit, DerivedMesh *cageDM, EditVert *eve_act)
 {
        ToolSettings *ts= scene->toolsettings;
        int sel;
@@ -2080,13 +2077,15 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E
        Mesh *me= ob->data;
        EditEdge *eed;
        EditFace *efa;
-       float v1[3], v2[3], v3[3], v4[3], x, y, z;
+       float v1[3], v2[3], v3[3], v4[3], vmid[3];
        float fvec[3];
        char val[32]; /* Stores the measurement display text here */
        char conv_float[5]; /* Use a float conversion matching the grid size */
        float area, col[3]; /* area of the face,  color of the text to draw */
        float grid= unit->system ? unit->scale_length : v3d->grid;
-       int do_split= unit->flag & USER_UNIT_OPT_SPLIT;
+       const int do_split= unit->flag & USER_UNIT_OPT_SPLIT;
+       const int do_global= v3d->flag & V3D_GLOBAL_STATS;
+       const int do_moving= G.moving;
 
        if(v3d->flag2 & V3D_RENDER_OVERRIDE)
                return;
@@ -2119,24 +2118,22 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E
                
                for(eed= em->edges.first; eed; eed= eed->next) {
                        /* draw non fgon edges, or selected edges, or edges next to selected verts while draging */
-                       if((eed->h != EM_FGON) && ((eed->f & SELECT) || (G.moving && ((eed->v1->f & SELECT) || (eed->v2->f & SELECT)) ))) {
-                               VECCOPY(v1, eed->v1->co);
-                               VECCOPY(v2, eed->v2->co);
-                               
-                               x= 0.5f*(v1[0]+v2[0]);
-                               y= 0.5f*(v1[1]+v2[1]);
-                               z= 0.5f*(v1[2]+v2[2]);
-                               
-                               if(v3d->flag & V3D_GLOBAL_STATS) {
-                                       mul_m4_v3(ob->obmat, v1);
-                                       mul_m4_v3(ob->obmat, v2);
+                       if((eed->h != EM_FGON) && ((eed->f & SELECT) || (do_moving && ((eed->v1->f & SELECT) || (eed->v2->f & SELECT)) ))) {
+                               copy_v3_v3(v1, eed->v1->co);
+                               copy_v3_v3(v2, eed->v2->co);
+
+                               interp_v3_v3v3(vmid, v1, v2, 0.5f);
+
+                               if(do_global) {
+                                       mul_mat3_m4_v3(ob->obmat, v1);
+                                       mul_mat3_m4_v3(ob->obmat, v2);
                                }
                                if(unit->system)
                                        bUnit_AsString(val, sizeof(val), len_v3v3(v1, v2)*unit->scale_length, 3, unit->system, B_UNIT_LENGTH, do_split, FALSE);
                                else
                                        sprintf(val, conv_float, len_v3v3(v1, v2));
                                
-                               view3d_cached_text_draw_add(x, y, z, val, 0, 0);
+                               view3d_cached_text_draw_add(vmid, val, 0, V3D_CACHE_TEXT_ASCII);
                        }
                }
        }
@@ -2151,18 +2148,18 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E
                glColor3fv(col);
                
                for(efa= em->faces.first; efa; efa= efa->next) {
-                       if((efa->f & SELECT)) { // XXX || (G.moving && faceselectedOR(efa, SELECT)) ) {
-                               VECCOPY(v1, efa->v1->co);
-                               VECCOPY(v2, efa->v2->co);
-                               VECCOPY(v3, efa->v3->co);
+                       if((efa->f & SELECT)) { // XXX || (do_moving && faceselectedOR(efa, SELECT)) ) {
+                               copy_v3_v3(v1, efa->v1->co);
+                               copy_v3_v3(v2, efa->v2->co);
+                               copy_v3_v3(v3, efa->v3->co);
                                if (efa->v4) {
-                                       VECCOPY(v4, efa->v4->co);
+                                       copy_v3_v3(v4, efa->v4->co);
                                }
-                               if(v3d->flag & V3D_GLOBAL_STATS) {
-                                       mul_m4_v3(ob->obmat, v1);
-                                       mul_m4_v3(ob->obmat, v2);
-                                       mul_m4_v3(ob->obmat, v3);
-                                       if (efa->v4) mul_m4_v3(ob->obmat, v4);
+                               if(do_global) {
+                                       mul_mat3_m4_v3(ob->obmat, v1);
+                                       mul_mat3_m4_v3(ob->obmat, v2);
+                                       mul_mat3_m4_v3(ob->obmat, v3);
+                                       if (efa->v4) mul_mat3_m4_v3(ob->obmat, v4);
                                }
                                
                                if (efa->v4)
@@ -2175,7 +2172,7 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E
                                else
                                        sprintf(val, conv_float, area);
 
-                               view3d_cached_text_draw_add(efa->cent[0], efa->cent[1], efa->cent[2], val, 0, 0);
+                               view3d_cached_text_draw_add(efa->cent, val, 0, V3D_CACHE_TEXT_ASCII);
                        }
                }
        }
@@ -2190,20 +2187,20 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E
                glColor3fv(col);
                
                for(efa= em->faces.first; efa; efa= efa->next) {
-                       VECCOPY(v1, efa->v1->co);
-                       VECCOPY(v2, efa->v2->co);
-                       VECCOPY(v3, efa->v3->co);
+                       copy_v3_v3(v1, efa->v1->co);
+                       copy_v3_v3(v2, efa->v2->co);
+                       copy_v3_v3(v3, efa->v3->co);
                        if(efa->v4) {
-                               VECCOPY(v4, efa->v4->co); 
+                               copy_v3_v3(v4, efa->v4->co); 
                        }
                        else {
-                               VECCOPY(v4, v3);
+                               copy_v3_v3(v4, v3);
                        }
-                       if(v3d->flag & V3D_GLOBAL_STATS) {
-                               mul_m4_v3(ob->obmat, v1);
-                               mul_m4_v3(ob->obmat, v2);
-                               mul_m4_v3(ob->obmat, v3);
-                               mul_m4_v3(ob->obmat, v4);
+                       if(do_global) {
+                               mul_mat3_m4_v3(ob->obmat, v1);
+                               mul_mat3_m4_v3(ob->obmat, v2);
+                               mul_mat3_m4_v3(ob->obmat, v3);
+                               mul_mat3_m4_v3(ob->obmat, v4); /* intentionally executed even for tri's */
                        }
                        
                        e1= efa->e1;
@@ -2213,33 +2210,33 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E
                        
                        /* Calculate the angles */
                                
-                       if( (e4->f & e1->f & SELECT) || (G.moving && (efa->v1->f & SELECT)) ) {
+                       if( (e4->f & e1->f & SELECT) || (do_moving && (efa->v1->f & SELECT)) ) {
                                /* Vec 1 */
                                sprintf(val,"%.3f", RAD2DEG(angle_v3v3v3(v4, v1, v2)));
                                interp_v3_v3v3(fvec, efa->cent, efa->v1->co, 0.8f);
-                               view3d_cached_text_draw_add(fvec[0], fvec[1], fvec[2], val, 0, 0);
+                               view3d_cached_text_draw_add(fvec, val, 0, V3D_CACHE_TEXT_ASCII);
                        }
-                       if( (e1->f & e2->f & SELECT) || (G.moving && (efa->v2->f & SELECT)) ) {
+                       if( (e1->f & e2->f & SELECT) || (do_moving && (efa->v2->f & SELECT)) ) {
                                /* Vec 2 */
                                sprintf(val,"%.3f", RAD2DEG(angle_v3v3v3(v1, v2, v3)));
                                interp_v3_v3v3(fvec, efa->cent, efa->v2->co, 0.8f);
-                               view3d_cached_text_draw_add(fvec[0], fvec[1], fvec[2], val, 0, 0);
+                               view3d_cached_text_draw_add(fvec, val, 0, V3D_CACHE_TEXT_ASCII);
                        }
-                       if( (e2->f & e3->f & SELECT) || (G.moving && (efa->v3->f & SELECT)) ) {
+                       if( (e2->f & e3->f & SELECT) || (do_moving && (efa->v3->f & SELECT)) ) {
                                /* Vec 3 */
                                if(efa->v4) 
                                        sprintf(val,"%.3f", RAD2DEG(angle_v3v3v3(v2, v3, v4)));
                                else
                                        sprintf(val,"%.3f", RAD2DEG(angle_v3v3v3(v2, v3, v1)));
                                interp_v3_v3v3(fvec, efa->cent, efa->v3->co, 0.8f);
-                               view3d_cached_text_draw_add(fvec[0], fvec[1], fvec[2], val, 0, 0);
+                               view3d_cached_text_draw_add(fvec, val, 0, V3D_CACHE_TEXT_ASCII);
                        }
                                /* Vec 4 */
                        if(efa->v4) {
-                               if( (e3->f & e4->f & SELECT) || (G.moving && (efa->v4->f & SELECT)) ) {
+                               if( (e3->f & e4->f & SELECT) || (do_moving && (efa->v4->f & SELECT)) ) {
                                        sprintf(val,"%.3f", RAD2DEG(angle_v3v3v3(v3, v4, v1)));
                                        interp_v3_v3v3(fvec, efa->cent, efa->v4->co, 0.8f);
-                                       view3d_cached_text_draw_add(fvec[0], fvec[1], fvec[2], val, 0, 0);
+                                       view3d_cached_text_draw_add(fvec, val, 0, V3D_CACHE_TEXT_ASCII);
                                }
                        }
                }
@@ -2251,7 +2248,7 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E
        }
 }
 
-static int draw_em_fancy__setFaceOpts(void *userData, int index, int *drawSmooth_r)
+static int draw_em_fancy__setFaceOpts(void *UNUSED(userData), int index, int *UNUSED(drawSmooth_r))
 {
        EditFace *efa = EM_get_face_for_index(index);
 
@@ -2263,7 +2260,7 @@ static int draw_em_fancy__setFaceOpts(void *userData, int index, int *drawSmooth
                return 0;
 }
 
-static int draw_em_fancy__setGLSLFaceOpts(void *userData, int index)
+static int draw_em_fancy__setGLSLFaceOpts(void *UNUSED(userData), int index)
 {
        EditFace *efa = EM_get_face_for_index(index);
 
@@ -2313,7 +2310,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object
                        glEnable(GL_LIGHTING);
                        glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
 
-                       finalDM->drawMappedFaces(finalDM, draw_em_fancy__setFaceOpts, 0, 0);
+                       finalDM->drawMappedFaces(finalDM, draw_em_fancy__setFaceOpts, 0, 0, GPU_enable_material);
 
                        glFrontFace(GL_CCW);
                        glDisable(GL_LIGHTING);
@@ -2333,7 +2330,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object
                }
        }
        
-       if((me->drawflag & (ME_DRAWFACES)) || paint_facesel_test(ob)) { /* transp faces */
+       if(me->drawflag & ME_DRAWFACES) {       /* transp faces */
                unsigned char col1[4], col2[4], col3[4];
                        
                UI_GetThemeColor4ubv(TH_FACE, (char *)col1);
@@ -2409,7 +2406,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object
        if(em) {
 // XXX         retopo_matrix_update(v3d);
 
-               draw_em_fancy_verts(scene, v3d, ob, em, cageDM, eve_act);
+               draw_em_fancy_verts(scene, v3d, ob, cageDM, eve_act);
 
                if(me->drawflag & ME_DRAWNORMALS) {
                        UI_ThemeColor(TH_NORMAL);
@@ -2459,7 +2456,7 @@ static void draw_mesh_object_outline(View3D *v3d, Object *ob, DerivedMesh *dm)
        }
 }
 
-static int wpaint__setSolidDrawOptions(void *userData, int index, int *drawSmooth_r)
+static int wpaint__setSolidDrawOptions(void *UNUSED(userData), int UNUSED(index), int *drawSmooth_r)
 {
        *drawSmooth_r = 1;
        return 1;
@@ -2470,7 +2467,8 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
        Object *ob= base->object;
        Mesh *me = ob->data;
        Material *ma= give_current_material(ob, 1);
-       int hasHaloMat = (ma && (ma->material_type == MA_TYPE_HALO));
+       const short hasHaloMat = (ma && (ma->material_type == MA_TYPE_HALO));
+       const short is_paint_sel= (ob==OBACT && paint_facesel_test(ob));
        int draw_wire = 0;
        int totvert, totedge, totface;
        DispList *dl;
@@ -2492,7 +2490,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
                glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
 
                // Unwanted combination.
-       if (ob==OBACT && paint_facesel_test(ob)) draw_wire = 0;
+       if (is_paint_sel) draw_wire = 0;
 
        if(dt==OB_BOUNDBOX) {
                if((v3d->flag2 & V3D_RENDER_OVERRIDE && v3d->drawtype >= OB_WIRE)==0)
@@ -2506,11 +2504,10 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
        else if(dt==OB_WIRE || totface==0) {
                draw_wire = 1; /* draw wire only, no depth buffer stuff  */
        }
-       else if(        (ob==OBACT && (ob->mode & OB_MODE_TEXTURE_PAINT || paint_facesel_test(ob))) ||
+       else if(        (is_paint_sel || (ob==OBACT && ob->mode & OB_MODE_TEXTURE_PAINT)) ||
                                CHECK_OB_DRAWTEXTURE(v3d, dt))
        {
-               int faceselect= (ob==OBACT && paint_facesel_test(ob));
-               if ((v3d->flag&V3D_SELECT_OUTLINE) && ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) && (base->flag&SELECT) && !(G.f&G_PICKSEL || paint_facesel_test(ob)) && !draw_wire) {
+               if ((v3d->flag&V3D_SELECT_OUTLINE) && ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) && (base->flag&SELECT) && !(G.f&G_PICKSEL || is_paint_sel) && !draw_wire) {
                        draw_mesh_object_outline(v3d, ob, dm);
                }
 
@@ -2525,10 +2522,10 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
                        glFrontFace(GL_CCW);
                }
                else {
-                       draw_mesh_textured(scene, v3d, rv3d, ob, dm, faceselect);
+                       draw_mesh_textured(scene, v3d, rv3d, ob, dm, is_paint_sel);
                }
 
-               if(!faceselect) {
+               if(!is_paint_sel) {
                        if(base->flag & SELECT)
                                UI_ThemeColor((ob==OBACT)?TH_ACTIVE:TH_SELECT);
                        else
@@ -2543,25 +2540,26 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
                        /* weight paint in solid mode, special case. focus on making the weights clear
                         * rather then the shading, this is also forced in wire view */
                        GPU_enable_material(0, NULL);
-                       dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, me->mface, 1);
-
+                       dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, me->mface, 1, GPU_enable_material);
+               
                        bglPolygonOffset(rv3d->dist, 1.0);
                        glDepthMask(0); // disable write in zbuffer, selected edge wires show better
 
                        glEnable(GL_BLEND);
-                       glColor4ub(196, 196, 196, 196);
+                       glColor4ub(255, 255, 255, 96);
                        glEnable(GL_LINE_STIPPLE);
-                       glLineStipple(1, 0x8888);
+                       glLineStipple(1, 0xAAAA);
 
-                       dm->drawEdges(dm, 1, 0);
+                       dm->drawEdges(dm, 1, 1);
 
                        bglPolygonOffset(rv3d->dist, 0.0);
                        glDepthMask(1);
                        glDisable(GL_LINE_STIPPLE);
 
                        GPU_disable_material();
-
-
+                       
+                       /* since we already draw wire as wp guide, dont draw over the top */
+                       draw_wire= 0;
                }
                else {
                        Paint *p;
@@ -2625,7 +2623,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
                                glEnable(GL_LIGHTING);
                                glEnable(GL_COLOR_MATERIAL);
 
-                               dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, me->mface, 1);
+                               dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, me->mface, 1, GPU_enable_material);
                                glDisable(GL_COLOR_MATERIAL);
                                glDisable(GL_LIGHTING);
 
@@ -2633,10 +2631,10 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
                        }
                        else if(ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_TEXTURE_PAINT)) {
                                if(me->mcol)
-                                       dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, NULL, 1);
+                                       dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, NULL, 1, GPU_enable_material);
                                else {
                                        glColor3f(1.0f, 1.0f, 1.0f);
-                                       dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, NULL, 0);
+                                       dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, NULL, 0, GPU_enable_material);
                                }
                        }
                        else do_draw= 1;
@@ -2746,7 +2744,8 @@ static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
        int do_alpha_pass= 0, drawlinked= 0, retval= 0, glsl, check_alpha;
        
        if(obedit && ob!=obedit && ob->data==obedit->data) {
-               if(ob_get_key(ob));
+               if(ob_get_key(ob) || ob_get_key(obedit));
+               else if(ob->modifiers.first || obedit->modifiers.first);
                else drawlinked= 1;
        }
        
@@ -2792,7 +2791,20 @@ static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
        }
        
        /* GPU_begin_object_materials checked if this is needed */
-       if(do_alpha_pass) add_view3d_after(v3d, base, V3D_TRANSP, flag);
+       if(do_alpha_pass) {
+               if(ob->dtx & OB_DRAWXRAY) {
+                       add_view3d_after(&v3d->afterdraw_xraytransp, base, flag);
+               }
+               else {
+                       add_view3d_after(&v3d->afterdraw_transp, base, flag);
+               }
+       }
+       else if(ob->dtx & OB_DRAWXRAY && ob->dtx & OB_DRAWTRANSP) {
+               /* special case xray+transp when alpha is 1.0, without this the object vanishes */
+               if(v3d->xray == 0 && v3d->transp == 0) {
+                       add_view3d_after(&v3d->afterdraw_xray, base, flag);
+               }
+       }
        
        return retval;
 }
@@ -3085,12 +3097,15 @@ static int drawCurveDerivedMesh(Scene *scene, View3D *v3d, RegionView3D *rv3d, B
                int glsl = draw_glsl_material(scene, ob, v3d, dt);
                GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL);
 
-               if (!glsl)
+               if(!glsl) {
                        glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 0);
+                       glEnable(GL_LIGHTING);
+                       dm->drawFacesSolid(dm, NULL, 0, GPU_enable_material);
+                       glDisable(GL_LIGHTING);
+               }
+               else
+                       dm->drawFacesGLSL(dm, GPU_enable_material);
 
-               glEnable(GL_LIGHTING);
-               dm->drawFacesSolid(dm, NULL, 0, GPU_enable_material);
-               glDisable(GL_LIGHTING);
                GPU_end_object_materials();
        } else {
                if((v3d->flag2 & V3D_RENDER_OVERRIDE && v3d->drawtype >= OB_SOLID)==0)
@@ -3126,7 +3141,7 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas
                        dl= lb->first;
                        if(dl==NULL) return 1;
 
-                       if(dl->nors==0) addnormalsDispList(ob, lb);
+                       if(dl->nors==0) addnormalsDispList(lb);
                        index3_nors_incr= 0;
                        
                        if( displist_has_faces(lb)==0) {
@@ -3173,7 +3188,7 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas
                        dl= lb->first;
                        if(dl==NULL) return 1;
                        
-                       if(dl->nors==NULL) addnormalsDispList(ob, lb);
+                       if(dl->nors==NULL) addnormalsDispList(lb);
                        
                        if(draw_glsl_material(scene, ob, v3d, dt)) {
                                GPU_begin_object_materials(v3d, rv3d, scene, ob, 1, NULL);
@@ -3260,23 +3275,29 @@ static void draw_particle_arrays(int draw_as, int totpoint, int ob_dt, int selec
 static void draw_particle(ParticleKey *state, int draw_as, short draw, float pixsize, float imat[4][4], float *draw_line, ParticleBillboardData *bb, ParticleDrawData *pdd)
 {
        float vec[3], vec2[3];
-       float *vd = pdd->vd;
-       float *cd = pdd->cd;
+       float *vd = NULL;
+       float *cd = NULL;
        float ma_r=0.0f;
        float ma_g=0.0f;
        float ma_b=0.0f;
 
-       if(pdd->ma_r) {
-               ma_r = *pdd->ma_r;
-               ma_g = *pdd->ma_g;
-               ma_b = *pdd->ma_b;
+       /* null only for PART_DRAW_CIRC */
+       if(pdd) {
+               vd = pdd->vd;
+               cd = pdd->cd;
+
+               if(pdd->ma_r) {
+                       ma_r = *pdd->ma_r;
+                       ma_g = *pdd->ma_g;
+                       ma_b = *pdd->ma_b;
+               }
        }
 
        switch(draw_as){
                case PART_DRAW_DOT:
                {
                        if(vd) {
-                               VECCOPY(vd,state->co) pdd->vd+=3;
+                               copy_v3_v3(vd,state->co); pdd->vd+=3;
                        }
                        if(cd) {
                                cd[0]=ma_r;
@@ -3301,7 +3322,7 @@ static void draw_particle(ParticleKey *state, int draw_as, short draw, float pix
                                cd[14]=cd[17]=1.0;
                                pdd->cd+=18;
 
-                               VECCOPY(vec2,state->co);
+                               copy_v3_v3(vec2,state->co);
                        }
                        else {
                                if(cd) {
@@ -3310,47 +3331,47 @@ static void draw_particle(ParticleKey *state, int draw_as, short draw, float pix
                                        cd[2]=cd[5]=cd[8]=cd[11]=cd[14]=cd[17]=ma_b;
                                        pdd->cd+=18;
                                }
-                               VECSUB(vec2,state->co,vec);
+                               sub_v3_v3v3(vec2, state->co, vec);
                        }
 
-                       VECADD(vec,state->co,vec);
-                       VECCOPY(pdd->vd,vec); pdd->vd+=3;
-                       VECCOPY(pdd->vd,vec2); pdd->vd+=3;
+                       add_v3_v3(vec, state->co);
+                       copy_v3_v3(pdd->vd,vec); pdd->vd+=3;
+                       copy_v3_v3(pdd->vd,vec2); pdd->vd+=3;
                                
                        vec[1]=2.0f*pixsize;
                        vec[0]=vec[2]=0.0;
                        mul_qt_v3(state->rot,vec);
                        if(draw_as==PART_DRAW_AXIS){
-                               VECCOPY(vec2,state->co);
+                               copy_v3_v3(vec2,state->co);
                        }               
-                       else VECSUB(vec2,state->co,vec);
+                       else sub_v3_v3v3(vec2, state->co, vec);
 
-                       VECADD(vec,state->co,vec);
-                       VECCOPY(pdd->vd,vec); pdd->vd+=3;
-                       VECCOPY(pdd->vd,vec2); pdd->vd+=3;
+                       add_v3_v3(vec, state->co);
+                       copy_v3_v3(pdd->vd,vec); pdd->vd+=3;
+                       copy_v3_v3(pdd->vd,vec2); pdd->vd+=3;
 
                        vec[2]=2.0f*pixsize;
                        vec[0]=vec[1]=0.0;
                        mul_qt_v3(state->rot,vec);
                        if(draw_as==PART_DRAW_AXIS){
-                               VECCOPY(vec2,state->co);
+                               copy_v3_v3(vec2,state->co);
                        }
-                       else VECSUB(vec2,state->co,vec);
+                       else sub_v3_v3v3(vec2, state->co, vec);
 
-                       VECADD(vec,state->co,vec);
+                       add_v3_v3(vec, state->co);
 
-                       VECCOPY(pdd->vd,vec); pdd->vd+=3;
-                       VECCOPY(pdd->vd,vec2); pdd->vd+=3;
+                       copy_v3_v3(pdd->vd,vec); pdd->vd+=3;
+                       copy_v3_v3(pdd->vd,vec2); pdd->vd+=3;
                        break;
                }
                case PART_DRAW_LINE:
                {
-                       VECCOPY(vec,state->vel);
+                       copy_v3_v3(vec,state->vel);
                        normalize_v3(vec);
                        if(draw & PART_DRAW_VEL_LENGTH)
                                mul_v3_fl(vec,len_v3(state->vel));
-                       VECADDFAC(pdd->vd,state->co,vec,-draw_line[0]); pdd->vd+=3;
-                       VECADDFAC(pdd->vd,state->co,vec,draw_line[1]); pdd->vd+=3;
+                       madd_v3_v3v3fl(pdd->vd, state->co, vec, -draw_line[0]); pdd->vd+=3;
+                       madd_v3_v3v3fl(pdd->vd, state->co, vec,  draw_line[1]); pdd->vd+=3;
                        if(cd) {
                                cd[0]=cd[3]=ma_r;
                                cd[1]=cd[4]=ma_g;
@@ -3361,8 +3382,6 @@ static void draw_particle(ParticleKey *state, int draw_as, short draw, float pix
                }
                case PART_DRAW_CIRC:
                {
-                       if(pdd->ma_r)
-                               glColor3f(ma_r,ma_g,ma_b);
                        drawcircball(GL_LINE_LOOP, state->co, pixsize, imat);
                        break;
                }
@@ -3377,27 +3396,27 @@ static void draw_particle(ParticleKey *state, int draw_as, short draw, float pix
                        }
 
 
-                       VECCOPY(bb->vec, state->co);
-                       VECCOPY(bb->vel, state->vel);
+                       copy_v3_v3(bb->vec, state->co);
+                       copy_v3_v3(bb->vel, state->vel);
 
                        psys_make_billboard(bb, xvec, yvec, zvec, bb_center);
                        
-                       VECADD(pdd->vd,bb_center,xvec);
-                       VECADD(pdd->vd,pdd->vd,yvec); pdd->vd+=3;
+                       add_v3_v3v3(pdd->vd, bb_center, xvec);
+                       add_v3_v3(pdd->vd, yvec); pdd->vd+=3;
 
-                       VECSUB(pdd->vd,bb_center,xvec);
-                       VECADD(pdd->vd,pdd->vd,yvec); pdd->vd+=3;
+                       sub_v3_v3v3(pdd->vd, bb_center, xvec);
+                       add_v3_v3(pdd->vd, yvec); pdd->vd+=3;
 
-                       VECSUB(pdd->vd,bb_center,xvec);
-                       VECSUB(pdd->vd,pdd->vd,yvec); pdd->vd+=3;
+                       sub_v3_v3v3(pdd->vd, bb_center, xvec);
+                       sub_v3_v3v3(pdd->vd, pdd->vd,yvec); pdd->vd+=3;
 
-                       VECADD(pdd->vd,bb_center,xvec);
-                       VECSUB(pdd->vd,pdd->vd,yvec); pdd->vd+=3;
+                       add_v3_v3v3(pdd->vd, bb_center, xvec);
+                       sub_v3_v3v3(pdd->vd, pdd->vd, yvec); pdd->vd+=3;
 
-                       VECCOPY(pdd->nd, zvec); pdd->nd+=3;
-                       VECCOPY(pdd->nd, zvec); pdd->nd+=3;
-                       VECCOPY(pdd->nd, zvec); pdd->nd+=3;
-                       VECCOPY(pdd->nd, zvec); pdd->nd+=3;
+                       copy_v3_v3(pdd->nd, zvec); pdd->nd+=3;
+                       copy_v3_v3(pdd->nd, zvec); pdd->nd+=3;
+                       copy_v3_v3(pdd->nd, zvec); pdd->nd+=3;
+                       copy_v3_v3(pdd->nd, zvec); pdd->nd+=3;
                        break;
                }
        }
@@ -3421,7 +3440,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
        ParticleData *pars, *pa;
        ParticleKey state, *states=0;
        ParticleBillboardData bb;
-       ParticleSimulationData sim = {scene, ob, psys, NULL};
+       ParticleSimulationData sim= {0};
        ParticleDrawData *pdd = psys->pdd;
        Material *ma;
        float vel[3], imat[4][4];
@@ -3459,6 +3478,9 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
                return;
 
 /* 2. */
+       sim.scene= scene;
+       sim.ob= ob;
+       sim.psys= psys;
        sim.psmd = psmd = psys_get_modifier(ob,psys);
 
        if(part->phystype==PART_PHYS_KEYED){
@@ -3496,12 +3518,6 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
        else
                cpack(0);
 
-       if(pdd) {
-               pdd->ma_r = &ma_r;
-               pdd->ma_g = &ma_g;
-               pdd->ma_b = &ma_b;
-       }
-
        timestep= psys_get_timestep(&sim);
 
        if( (base->flag & OB_FROMDUPLI) && (ob->flag & OB_FROMGROUP) ) {
@@ -3537,8 +3553,8 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
                case PART_DRAW_CROSS:
                case PART_DRAW_AXIS:
                        /* lets calculate the scale: */
-                       pixsize= rv3d->persmat[0][3]*ob->obmat[3][0]+ rv3d->persmat[1][3]*ob->obmat[3][1]+ rv3d->persmat[2][3]*ob->obmat[3][2]+ rv3d->persmat[3][3];
-                       pixsize*= rv3d->pixsize;
+                       pixsize= view3d_pixel_size(rv3d, ob->obmat[3]);
+                       
                        if(part->draw_size==0.0)
                                pixsize*=2.0;
                        else
@@ -3655,11 +3671,18 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
                pdd->tot_vec_size= tot_vec_size;
        }
 
+       if(pdd) {
+               pdd->ma_r = &ma_r;
+               pdd->ma_g = &ma_g;
+               pdd->ma_b = &ma_b;
+       }
+
        psys->lattice= psys_get_lattice(&sim);
 
-       if(pdd && draw_as!=PART_DRAW_PATH){
+       /* circles don't use drawdata, so have to add a special case here */
+       if((pdd || draw_as==PART_DRAW_CIRC) && draw_as!=PART_DRAW_PATH){
 /* 5. */
-               if((pdd->flag & PARTICLE_DRAW_DATA_UPDATED)
+               if(pdd && (pdd->flag & PARTICLE_DRAW_DATA_UPDATED)
                        && (pdd->vedata || part->draw & (PART_DRAW_SIZE|PART_DRAW_NUM|PART_DRAW_HEALTH))==0) {
                        totpoint = pdd->totpoint; /* draw data is up to date */
                }
@@ -3806,11 +3829,10 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
                                /* additional things to draw for each particle  */
                                /* (velocity, size and number)                                  */
                                if((part->draw & PART_DRAW_VEL) && pdd->vedata){
-                                       VECCOPY(pdd->ved,state.co);
-                                       pdd->ved+=3;
-                                       VECCOPY(vel,state.vel);
-                                       mul_v3_fl(vel,timestep);
-                                       VECADD(pdd->ved,state.co,vel);
+                                       copy_v3_v3(pdd->ved,state.co);
+                                       pdd->ved += 3;
+                                       mul_v3_v3fl(vel, state.vel, timestep);
+                                       add_v3_v3v3(pdd->ved, state.co, vel);
                                        pdd->ved+=3;
 
                                        totve++;
@@ -3828,16 +3850,24 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
                                        char *val_pos= val;
                                        val[0]= '\0';
 
-                                       if(part->draw&PART_DRAW_NUM)
-                                               val_pos += sprintf(val, "%i", a);
-
-                                       if((part->draw & PART_DRAW_HEALTH) && a < totpart && part->phystype==PART_PHYS_BOIDS)
-                                               sprintf(val_pos, (val_pos==val) ? "%.2f" : ":%.2f", pa_health);
+                                       if(part->draw&PART_DRAW_NUM) {
+                                               if(a < totpart && (part->draw & PART_DRAW_HEALTH) && (part->phystype==PART_PHYS_BOIDS)) {
+                                                       sprintf(val_pos, "%d:%.2f", a, pa_health);
+                                               }
+                                               else {
+                                                       sprintf(val_pos, "%d", a);
+                                               }
+                                       }
+                                       else {
+                                               if(a < totpart && (part->draw & PART_DRAW_HEALTH) && (part->phystype==PART_PHYS_BOIDS)) {
+                                                       sprintf(val_pos, "%.2f", pa_health);
+                                               }
+                                       }
 
                                        /* in path drawing state.co is the end point */
-                                       /* use worldspace beause object matrix is alredy applied */
+                                       /* use worldspace beause object matrix is already applied */
                                        mul_v3_m4v3(vec_txt, ob->imat, state.co);
-                                       view3d_cached_text_draw_add(vec_txt[0],  vec_txt[1],  vec_txt[2], val, 10, V3D_CACHE_TEXT_WORLDSPACE);
+                                       view3d_cached_text_draw_add(vec_txt, val, 10, V3D_CACHE_TEXT_WORLDSPACE|V3D_CACHE_TEXT_ASCII);
                                }
                        }
                }
@@ -3926,12 +3956,10 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
 
                        for(a=0, pa=psys->particles; a<totpart; a++, pa++){
                                float vec_txt[3];
-                               val[0]= '\0';
-
                                sprintf(val, "%i", a);
-                               /* use worldspace beause object matrix is alredy applied */
+                               /* use worldspace beause object matrix is already applied */
                                mul_v3_m4v3(vec_txt, ob->imat, cache[a]->co);
-                               view3d_cached_text_draw_add(vec_txt[0],  vec_txt[1],  vec_txt[2], val, 10, V3D_CACHE_TEXT_WORLDSPACE);
+                               view3d_cached_text_draw_add(vec_txt, val, 10, V3D_CACHE_TEXT_WORLDSPACE|V3D_CACHE_TEXT_ASCII);
                        }
                }
        }
@@ -4037,7 +4065,7 @@ static void draw_update_ptcache_edit(Scene *scene, Object *ob, PTCacheEdit *edit
                psys_cache_edit_paths(scene, ob, edit, CFRA);
 }
 
-static void draw_ptcache_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, PTCacheEdit *edit, int dt)
+static void draw_ptcache_edit(Scene *scene, View3D *v3d, PTCacheEdit *edit)
 {
        ParticleCacheKey **cache, *path, *pkey;
        PTCacheEditPoint *point;
@@ -4072,8 +4100,8 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Obj
        glEnableClientState(GL_VERTEX_ARRAY);
        glEnableClientState(GL_COLOR_ARRAY);
 
-       glEnable(GL_COLOR_MATERIAL);
        glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
+       glEnable(GL_COLOR_MATERIAL);
        glShadeModel(GL_SMOOTH);
 
        if(pset->brushtype == PE_BRUSH_WEIGHT) {
@@ -4088,7 +4116,7 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Obj
 
                if(timed) {
                        for(k=0, pcol=pathcol, pkey=path; k<steps; k++, pkey++, pcol+=4){
-                               VECCOPY(pcol, pkey->col);
+                               copy_v3_v3(pcol, pkey->col);
                                pcol[3] = 1.0f - fabs((float)CFRA - pkey->time)/(float)pset->fade_frames;
                        }
 
@@ -4126,15 +4154,15 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Obj
 
                                for(k=0, key=point->keys; k<point->totkey; k++, key++){
                                        if(pd) {
-                                               VECCOPY(pd, key->co);
+                                               copy_v3_v3(pd, key->co);
                                                pd += 3;
                                        }
 
                                        if(key->flag&PEK_SELECT){
-                                               VECCOPY(cd,sel_col);
+                                               copy_v3_v3(cd,sel_col);
                                        }
                                        else{
-                                               VECCOPY(cd,nosel_col);
+                                               copy_v3_v3(cd,nosel_col);
                                        }
 
                                        if(timed)
@@ -4208,12 +4236,12 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
        root[1] = root[2] = 0.0f;
        root[0] = -drw_size;
        mul_m3_v3(tr,root);
-       VECADD(root,root,com);
+       add_v3_v3(root, com);
        glVertex3fv(root); 
        tip[1] = tip[2] = 0.0f;
        tip[0] = drw_size;
        mul_m3_v3(tr,tip);
-       VECADD(tip,tip,com);
+       add_v3_v3(tip, com);
        glVertex3fv(tip); 
        glEnd();
 
@@ -4221,7 +4249,7 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
        root[0] = th;
        glBegin(GL_LINES);
        mul_m3_v3(tr,root);
-       VECADD(root,root,com);
+       add_v3_v3(root, com);
        glVertex3fv(root); 
        glVertex3fv(tip); 
        glEnd();
@@ -4230,7 +4258,7 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
        root[0] = th;
        glBegin(GL_LINES);
        mul_m3_v3(tr,root);
-       VECADD(root,root,com);
+       add_v3_v3(root, com);
        glVertex3fv(root); 
        glVertex3fv(tip); 
        glEnd();
@@ -4239,7 +4267,7 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
        root[0] =th;
        glBegin(GL_LINES);
        mul_m3_v3(tr,root);
-       VECADD(root,root,com);
+       add_v3_v3(root, com);
        glVertex3fv(root); 
        glVertex3fv(tip); 
        glEnd();
@@ -4248,7 +4276,7 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
        root[0] = th;
        glBegin(GL_LINES);
        mul_m3_v3(tr,root);
-       VECADD(root,root,com);
+       add_v3_v3(root, com);
        glVertex3fv(root); 
        glVertex3fv(tip); 
        glEnd();
@@ -4259,12 +4287,12 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
        root[0] = root[2] = 0.0f;
        root[1] = -drw_size;
        mul_m3_v3(tr,root);
-       VECADD(root,root,com);
+       add_v3_v3(root, com);
        glVertex3fv(root); 
        tip[0] = tip[2] = 0.0f;
        tip[1] = drw_size;
        mul_m3_v3(tr,tip);
-       VECADD(tip,tip,com);
+       add_v3_v3(tip, com);
        glVertex3fv(tip); 
        glEnd();
 
@@ -4272,7 +4300,7 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
        root[1] = th;
        glBegin(GL_LINES);
        mul_m3_v3(tr,root);
-       VECADD(root,root,com);
+       add_v3_v3(root, com);
        glVertex3fv(root); 
        glVertex3fv(tip); 
        glEnd();
@@ -4281,7 +4309,7 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
        root[1] = th;
        glBegin(GL_LINES);
        mul_m3_v3(tr,root);
-       VECADD(root,root,com);
+       add_v3_v3(root, com);
        glVertex3fv(root); 
        glVertex3fv(tip); 
        glEnd();
@@ -4290,7 +4318,7 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
        root[1] =th;
        glBegin(GL_LINES);
        mul_m3_v3(tr,root);
-       VECADD(root,root,com);
+       add_v3_v3(root, com);
        glVertex3fv(root); 
        glVertex3fv(tip); 
        glEnd();
@@ -4299,7 +4327,7 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
        root[1] = th;
        glBegin(GL_LINES);
        mul_m3_v3(tr,root);
-       VECADD(root,root,com);
+       add_v3_v3(root, com);
        glVertex3fv(root); 
        glVertex3fv(tip); 
        glEnd();
@@ -4309,12 +4337,12 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
        root[0] = root[1] = 0.0f;
        root[2] = -drw_size;
        mul_m3_v3(tr,root);
-       VECADD(root,root,com);
+       add_v3_v3(root, com);
        glVertex3fv(root); 
        tip[0] = tip[1] = 0.0f;
        tip[2] = drw_size;
        mul_m3_v3(tr,tip);
-       VECADD(tip,tip,com);
+       add_v3_v3(tip, com);
        glVertex3fv(tip); 
        glEnd();
 
@@ -4322,7 +4350,7 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
        root[2] = th;
        glBegin(GL_LINES);
        mul_m3_v3(tr,root);
-       VECADD(root,root,com);
+       add_v3_v3(root, com);
        glVertex3fv(root); 
        glVertex3fv(tip); 
        glEnd();
@@ -4331,7 +4359,7 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
        root[2] = th;
        glBegin(GL_LINES);
        mul_m3_v3(tr,root);
-       VECADD(root,root,com);
+       add_v3_v3(root, com);
        glVertex3fv(root); 
        glVertex3fv(tip); 
        glEnd();
@@ -4340,7 +4368,7 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
        root[2] = th;
        glBegin(GL_LINES);
        mul_m3_v3(tr,root);
-       VECADD(root,root,com);
+       add_v3_v3(root, com);
        glVertex3fv(root); 
        glVertex3fv(tip); 
        glEnd();
@@ -4349,7 +4377,7 @@ static void ob_draw_RE_motion(float com[3],float rotscale[3][3],float itw,float
        root[2] = th;
        glBegin(GL_LINES);
        mul_m3_v3(tr,root);
-       VECADD(root,root,com);
+       add_v3_v3(root, com);
        glVertex3fv(root); 
        glVertex3fv(tip); 
        glEnd();
@@ -4742,9 +4770,17 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
                        
                        while (nr-->0) { /* accounts for empty bevel lists */
                                float fac= bevp->radius * ts->normalsize;
-                               float vec_a[3] = { fac,0, 0}; // Offset perpendicular to the curve
-                               float vec_b[3] = {-fac,0, 0}; // Delta along the curve
+                               float vec_a[3]; // Offset perpendicular to the curve
+                               float vec_b[3]; // Delta along the curve
 
+                               vec_a[0]= fac;
+                               vec_a[1]= 0.0f;
+                               vec_a[2]= 0.0f;
+
+                               vec_b[0]= -fac;
+                               vec_b[1]= 0.0f;
+                               vec_b[2]= 0.0f;
+                               
                                mul_qt_v3(bevp->quat, vec_a);
                                mul_qt_v3(bevp->quat, vec_b);
                                add_v3_v3(vec_a, bevp->vec);
@@ -4783,7 +4819,7 @@ static void draw_empty_sphere (float size)
                GLUquadricObj   *qobj;
                
                displist= glGenLists(1);
-               glNewList(displist, GL_COMPILE_AND_EXECUTE);
+               glNewList(displist, GL_COMPILE);
                
                glPushMatrix();
                
@@ -4804,8 +4840,8 @@ static void draw_empty_sphere (float size)
        }
        
        glScalef(size, size, size);
-               glCallList(displist);
-       glScalef(1/size, 1/size, 1/size);
+       glCallList(displist);
+       glScalef(1.0f/size, 1.0f/size, 1.0f/size);
 }
 
 /* draw a cone for use as an empty drawtype */
@@ -4831,9 +4867,9 @@ static void draw_empty_cone (float size)
 }
 
 /* draw points on curve speed handles */
+#if 0 // XXX old animation system stuff
 static void curve_draw_speed(Scene *scene, Object *ob)
 {
-#if 0 // XXX old animation system stuff
        Curve *cu= ob->data;
        IpoCurve *icu;
        BezTriple *bezt;
@@ -4859,8 +4895,8 @@ static void curve_draw_speed(Scene *scene, Object *ob)
 
        glPointSize(1.0);
        bglEnd();
-#endif // XXX old animation system stuff
 }
+#endif // XXX old animation system stuff
 
 
 static void draw_textcurs(float textcurs[][2])
@@ -4888,12 +4924,10 @@ static void drawspiral(float *cent, float rad, float tmat[][4], int start)
                start *= -1;
        }
 
-       VECCOPY(vx, tmat[0]);
-       VECCOPY(vy, tmat[1]);
-       mul_v3_fl(vx, rad);
-       mul_v3_fl(vy, rad);
+       mul_v3_v3fl(vx, tmat[0], rad);
+       mul_v3_v3fl(vy, tmat[1], rad);
 
-       VECCOPY(vec, cent);
+       copy_v3_v3(vec, cent);
 
        if (inverse==0) {
                for(a=0; a<tot; a++) {
@@ -5166,7 +5200,7 @@ static void draw_forcefield(Scene *scene, Object *ob, RegionView3D *rv3d)
                        UI_ThemeColorBlend(curcol, TH_BACK, 0.5);
                        drawcircball(GL_LINE_LOOP, guidevec1, mindist, imat);
                        
-                       VECCOPY(vec, guidevec1);        /* max center */
+                       copy_v3_v3(vec, guidevec1);     /* max center */
                }
        }
 
@@ -5252,8 +5286,8 @@ void get_local_bounds(Object *ob, float *center, float *size)
        BoundBox *bb= object_get_boundbox(ob);
        
        if(bb==NULL) {
-               center[0]= center[1]= center[2]= 0.0;
-               VECCOPY(size, ob->size);
+               zero_v3(center);
+               copy_v3_v3(size, ob->size);
        }
        else {
                size[0]= 0.5*fabs(bb->vec[0][0] - bb->vec[4][0]);
@@ -5318,10 +5352,12 @@ static void draw_bounding_volume(Scene *scene, Object *ob)
                bb= ob->bb ? ob->bb : ( (Curve *)ob->data )->bb;
        }
        else if(ob->type==OB_MBALL) {
-               bb= ob->bb;
-               if(bb==0) {
-                       makeDispListMBall(scene, ob);
+               if(is_basis_mball(ob)) {
                        bb= ob->bb;
+                       if(bb==0) {
+                               makeDispListMBall(scene, ob);
+                               bb= ob->bb;
+                       }
                }
        }
        else {
@@ -5345,13 +5381,13 @@ static void drawtexspace(Object *ob)
        }
        else if ELEM3(ob->type, OB_CURVE, OB_SURF, OB_FONT) {
                Curve *cu= ob->data;
-               VECCOPY(size, cu->size);
-               VECCOPY(loc, cu->loc);
+               copy_v3_v3(size, cu->size);
+               copy_v3_v3(loc, cu->loc);
        }
        else if(ob->type==OB_MBALL) {
                MetaBall *mb= ob->data;
-               VECCOPY(size, mb->size);
-               VECCOPY(loc, mb->loc);
+               copy_v3_v3(size, mb->size);
+               copy_v3_v3(loc, mb->loc);
        }
        else return;
        
@@ -5372,7 +5408,7 @@ static void drawtexspace(Object *ob)
 }
 
 /* draws wire outline */
-static void drawSolidSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base) 
+static void drawObjectSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
 {
        RegionView3D *rv3d= ar->regiondata;
        Object *ob= base->object;
@@ -5401,8 +5437,10 @@ static void drawSolidSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
                        draw_index_wire= 1;
                }
        } else if (ob->type==OB_MBALL) {
-               if((base->flag & OB_FROMDUPLI)==0) 
-                       drawDispListwire(&ob->disp);
+               if(is_basis_mball(ob)) {
+                       if((base->flag & OB_FROMDUPLI)==0)
+                               drawDispListwire(&ob->disp);
+               }
        }
        else if(ob->type==OB_ARMATURE) {
                if(!(ob->mode & OB_MODE_POSE))
@@ -5456,7 +5494,9 @@ static void drawWireExtra(Scene *scene, RegionView3D *rv3d, Object *ob)
                                draw_index_wire= 1;
                }
        } else if (ob->type==OB_MBALL) {
-               drawDispListwire(&ob->disp);
+               if(is_basis_mball(ob)) {
+                       drawDispListwire(&ob->disp);
+               }
        }
 
        glDepthMask(1);
@@ -5496,34 +5536,31 @@ static void draw_hooks(Object *ob)
 //<rcruiz>
 void drawRBpivot(bRigidBodyJointConstraint *data)
 {
-       float radsPerDeg = 6.283185307179586232f / 360.f;
        int axis;
-       float v1[3]= {data->pivX, data->pivY, data->pivZ};
-       float eu[3]= {radsPerDeg*data->axX, radsPerDeg*data->axY, radsPerDeg*data->axZ};
        float mat[4][4];
 
-       eul_to_mat4(mat,eu);
+       eul_to_mat4(mat,&data->axX);
        glLineWidth (4.0f);
        setlinestyle(2);
        for (axis=0; axis<3; axis++) {
                float dir[3] = {0,0,0};
-               float v[3]= {data->pivX, data->pivY, data->pivZ};
+               float v[3];
+
+               copy_v3_v3(v, &data->pivX);
 
                dir[axis] = 1.f;
                glBegin(GL_LINES);
                mul_m4_v3(mat,dir);
-               v[0] += dir[0];
-               v[1] += dir[1];
-               v[2] += dir[2];
-               glVertex3fv(v1);
+               add_v3_v3(v, dir);
+               glVertex3fv(&data->pivX);
                glVertex3fv(v);                 
                glEnd();
                if (axis==0)
-                       view3d_cached_text_draw_add(v[0], v[1], v[2], "px", 0, 0);
+                       view3d_cached_text_draw_add(v, "px", 0, V3D_CACHE_TEXT_ASCII);
                else if (axis==1)
-                       view3d_cached_text_draw_add(v[0], v[1], v[2], "py", 0, 0);
+                       view3d_cached_text_draw_add(v, "py", 0, V3D_CACHE_TEXT_ASCII);
                else
-                       view3d_cached_text_draw_add(v[0], v[1], v[2], "pz", 0, 0);
+                       view3d_cached_text_draw_add(v, "pz", 0, V3D_CACHE_TEXT_ASCII);
        }
        glLineWidth (1.0f);
        setlinestyle(0);
@@ -5567,7 +5604,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                if(!(ob->mode & OB_MODE_PARTICLE_EDIT)) {
                        /* xray and transp are set when it is drawing the 2nd/3rd pass */
                        if(!v3d->xray && !v3d->transp && (ob->dtx & OB_DRAWXRAY) && !(ob->dtx & OB_DRAWTRANSP)) {
-                               add_view3d_after(v3d, base, V3D_XRAY, flag);
+                               add_view3d_after(&v3d->afterdraw_xray, base, flag);
                                return;
                        }
                }
@@ -5661,13 +5698,13 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                bAnimVizSettings *avs= &ob->avs;
                
                /* setup drawing environment for paths */
-               draw_motion_paths_init(scene, v3d, ar);
+               draw_motion_paths_init(v3d, ar);
                
                /* draw motion path for object */
-               draw_motion_path_instance(scene, v3d, ar, ob, NULL, avs, ob->mpath);
+               draw_motion_path_instance(scene, ob, NULL, avs, ob->mpath);
                
                /* cleanup after drawing */
-               draw_motion_paths_cleanup(scene, v3d, ar);
+               draw_motion_paths_cleanup(v3d);
        }
 
        /* multiply view with object matrix.
@@ -5769,12 +5806,12 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                if (cu->disp.first==NULL) makeDispListCurveTypes(scene, ob, 0);
        }
        
-       /* draw outline for selected solid objects, mesh does itself */
+       /* draw outline for selected objects, mesh does itself */
        if((v3d->flag & V3D_SELECT_OUTLINE) && ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) && ob->type!=OB_MESH) {
-               if(dt>OB_WIRE && dt<OB_TEXTURE && (ob->mode & OB_MODE_EDIT)==0 && (flag & DRAW_SCENESET)==0) {
+               if(dt>OB_WIRE && (ob->mode & OB_MODE_EDIT)==0 && (flag & DRAW_SCENESET)==0) {
                        if (!(ob->dtx&OB_DRAWWIRE) && (ob->flag&SELECT) && !(flag&DRAW_PICKING)) {
                                
-                               drawSolidSelect(scene, v3d, ar, base);
+                               drawObjectSelect(scene, v3d, ar, base);
                        }
                }
        }
@@ -5802,8 +5839,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                                if (cu->linewidth != 0.0) {
                                        cpack(0xff44ff);
                                        UI_ThemeColor(TH_WIRE);
-                                       VECCOPY(vec1, ob->orig);
-                                       VECCOPY(vec2, ob->orig);
+                                       copy_v3_v3(vec1, ob->orig);
+                                       copy_v3_v3(vec2, ob->orig);
                                        vec1[0] += cu->linewidth;
                                        vec2[0] += cu->linewidth;
                                        vec1[1] += cu->linedist * cu->fsize;
@@ -5823,8 +5860,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                                                        UI_ThemeColor(TH_ACTIVE);
                                                else
                                                        UI_ThemeColor(TH_WIRE);
-                                               vec1[0] = cu->tb[i].x;
-                                               vec1[1] = cu->tb[i].y + cu->fsize;
+                                               vec1[0] = (cu->xof * cu->fsize) + cu->tb[i].x;
+                                               vec1[1] = (cu->yof * cu->fsize) + cu->tb[i].y + cu->fsize;
                                                vec1[2] = 0.001;
                                                glBegin(GL_LINE_STRIP);
                                                glVertex3fv(vec1);
@@ -5882,7 +5919,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                        cu= ob->data;
 
                        if(cu->editnurb) {
-                               drawnurb(scene, v3d, rv3d, base, cu->editnurb->first, dt);
+                               ListBase *nurbs= ED_curve_editnurbs(cu);
+                               drawnurb(scene, v3d, rv3d, base, nurbs->first, dt);
                        }
                        else if(dt==OB_BOUNDBOX) {
                                if((v3d->flag2 & V3D_RENDER_OVERRIDE && v3d->drawtype >= OB_WIRE)==0)
@@ -5890,9 +5928,9 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                        }
                        else if(boundbox_clip(rv3d, ob->obmat, ob->bb ? ob->bb : cu->bb)) {
                                empty_object= drawDispList(scene, v3d, rv3d, base, dt);
-                               
-                               if(cu->path)
-                                       curve_draw_speed(scene, ob);
+
+//XXX old animsys                              if(cu->path)
+//                                                     curve_draw_speed(scene, ob);
                        }
                        break;
                case OB_MBALL:
@@ -5911,7 +5949,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                }
                case OB_EMPTY:
                        if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0)
-                               drawaxes(rv3d, rv3d->viewmatob, ob->empty_drawsize, flag, ob->empty_drawtype);
+                               drawaxes(ob->empty_drawsize, ob->empty_drawtype);
                        break;
                case OB_LAMP:
                        if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
@@ -5937,7 +5975,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                        break;
                default:
                        if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
-                               drawaxes(rv3d, rv3d->viewmatob, 1.0, flag, OB_ARROWS);
+                               drawaxes(1.0, OB_ARROWS);
                        }
        }
 
@@ -5990,7 +6028,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 
                        draw_new_particle_system(scene, v3d, rv3d, base, psys, dt);
                }
-               
+               invert_m4_m4(ob->imat, ob->obmat);
                view3d_cached_text_draw_end(v3d, ar, 0, NULL);
 
                glMultMatrixf(ob->obmat);
@@ -6009,7 +6047,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                        PTCacheEdit *edit = PE_create_current(scene, ob);
                        if(edit) {
                                glLoadMatrixf(rv3d->viewmat);
-                               draw_ptcache_edit(scene, v3d, rv3d, ob, edit, dt);
+                               draw_update_ptcache_edit(scene, ob, edit);
+                               draw_ptcache_edit(scene, v3d, edit);
                                glMultMatrixf(ob->obmat);
                        }
                }
@@ -6063,7 +6102,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 // #if 0
                                smd->domain->tex = NULL;
                                GPU_create_smoke(smd, 0);
-                               draw_volume(scene, ar, v3d, base, smd->domain->tex, smd->domain->p0, smd->domain->p1, smd->domain->res, smd->domain->dx, smd->domain->tex_shadow);
+                               draw_volume(ar, smd->domain->tex, smd->domain->p0, smd->domain->p1, smd->domain->res, smd->domain->dx, smd->domain->tex_shadow);
                                GPU_free_smoke(smd);
 // #endif
 #if 0
@@ -6091,7 +6130,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                                        if(density[index] > FLT_EPSILON)
                                        {
                                                float color[3];
-                                               VECCOPY(tmp, smd->domain->p0);
+                                               copy_v3_v3(tmp, smd->domain->p0);
                                                tmp[0] += smd->domain->dx * x + smd->domain->dx * 0.5;
                                                tmp[1] += smd->domain->dx * y + smd->domain->dx * 0.5;
                                                tmp[2] += smd->domain->dx * z + smd->domain->dx * 0.5;
@@ -6114,7 +6153,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                        {
                                smd->domain->tex = NULL;
                                GPU_create_smoke(smd, 1);
-                               draw_volume(scene, ar, v3d, base, smd->domain->tex, smd->domain->p0, smd->domain->p1, smd->domain->res_wt, smd->domain->dx_wt, smd->domain->tex_shadow);
+                               draw_volume(ar, smd->domain->tex, smd->domain->p0, smd->domain->p1, smd->domain->res_wt, smd->domain->dx_wt, smd->domain->tex_shadow);
                                GPU_free_smoke(smd);
                        }
                }
@@ -6135,9 +6174,9 @@ 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) {
-        
+
                        if(dtx & OB_AXIS) {
-                               drawaxes(rv3d, rv3d->viewmatob, 1.0f, flag, OB_ARROWS);
+                               drawaxes(1.0f, OB_ARROWS);
                        }
                        if(dtx & OB_BOUNDBOX) {
                                if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0)
@@ -6148,7 +6187,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                                /* 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);
+                                       float zero[3]= {0,0,0};
+                                       view3d_cached_text_draw_add(zero, ob->id.name+2, 10, 0);
                                }
                        }
                        /*if(dtx & OB_DRAWIMAGE) drawDispListwire(&ob->disp);*/
@@ -6159,9 +6199,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
        if(dt<OB_SHADED && (v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
                if((ob->gameflag & OB_DYNAMIC) || 
                        ((ob->gameflag & OB_BOUNDS) && (ob->boundtype == OB_BOUND_SPHERE))) {
-                       float imat[4][4], vec[3];
+                       float imat[4][4], vec[3]= {0.0f, 0.0f, 0.0f};
 
-                       vec[0]= vec[1]= vec[2]= 0.0;
                        invert_m4_m4(imat, rv3d->viewmatob);
 
                        setlinestyle(2);
@@ -6171,6 +6210,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
        }
        
        /* return warning, this is cached text draw */
+       invert_m4_m4(ob->imat, ob->obmat);
        view3d_cached_text_draw_end(v3d, ar, 1, NULL);
 
        glLoadMatrixf(rv3d->viewmat);
@@ -6233,10 +6273,10 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                if (list) {
                        bConstraint *curcon;
                        bConstraintOb *cob;
-                       char col[4], col2[4];
+                       char col1[4], col2[4];
                        
-                       UI_GetThemeColor3ubv(TH_GRID, col);
-                       UI_make_axis_color(col, col2, 'z');
+                       UI_GetThemeColor3ubv(TH_GRID, col1);
+                       UI_make_axis_color(col1, col2, 'z');
                        glColor3ubv((GLubyte *)col2);
                        
                        cob= constraints_make_evalob(scene, ob, NULL, CONSTRAINT_OBTYPE_OBJECT);
@@ -6278,7 +6318,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 
 /* ***************** BACKBUF SEL (BBS) ********* */
 
-static void bbs_mesh_verts__mapFunc(void *userData, int index, float *co, float *no_f, short *no_s)
+static void bbs_mesh_verts__mapFunc(void *userData, int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s))
 {
        int offset = (intptr_t) userData;
        EditVert *eve = EM_get_vert_for_index(index);
@@ -6314,7 +6354,7 @@ static void bbs_mesh_wire(DerivedMesh *dm, int offset)
        dm->drawMappedEdges(dm, bbs_mesh_wire__setDrawOptions, (void*)(intptr_t) offset);
 }              
 
-static int bbs_mesh_solid__setSolidDrawOptions(void *userData, int index, int *drawSmooth_r)
+static int bbs_mesh_solid__setSolidDrawOptions(void *userData, int index, int *UNUSED(drawSmooth_r))
 {
        if (EM_get_face_for_index(index)->h==0) {
                if (userData) {
@@ -6326,7 +6366,7 @@ static int bbs_mesh_solid__setSolidDrawOptions(void *userData, int index, int *d
        }
 }
 
-static void bbs_mesh_solid__drawCenter(void *userData, int index, float *cent, float *no)
+static void bbs_mesh_solid__drawCenter(void *UNUSED(userData), int index, float *cent, float *UNUSED(no))
 {
        EditFace *efa = EM_get_face_for_index(index);
 
@@ -6343,7 +6383,7 @@ static void bbs_mesh_solid_EM(Scene *scene, View3D *v3d, Object *ob, DerivedMesh
        cpack(0);
 
        if (facecol) {
-               dm->drawMappedFaces(dm, bbs_mesh_solid__setSolidDrawOptions, (void*)(intptr_t) 1, 0);
+               dm->drawMappedFaces(dm, bbs_mesh_solid__setSolidDrawOptions, (void*)(intptr_t) 1, 0, GPU_enable_material);
 
                if(check_ob_drawface_dot(scene, v3d, ob->dt)) {
                        glPointSize(UI_GetThemeValuef(TH_FACEDOT_SIZE));
@@ -6354,17 +6394,17 @@ static void bbs_mesh_solid_EM(Scene *scene, View3D *v3d, Object *ob, DerivedMesh
                }
 
        } else {
-               dm->drawMappedFaces(dm, bbs_mesh_solid__setSolidDrawOptions, (void*) 0, 0);
+               dm->drawMappedFaces(dm, bbs_mesh_solid__setSolidDrawOptions, (void*) 0, 0, GPU_enable_material);
        }
 }
 
-static int bbs_mesh_solid__setDrawOpts(void *userData, int index, int *drawSmooth_r)
+static int bbs_mesh_solid__setDrawOpts(void *UNUSED(userData), int index, int *UNUSED(drawSmooth_r))
 {
        WM_set_framebuffer_index_color(index+1);
        return 1;
 }
 
-static int bbs_mesh_solid_hide__setDrawOpts(void *userData, int index, int *drawSmooth_r)
+static int bbs_mesh_solid_hide__setDrawOpts(void *userData, int index, int *UNUSED(drawSmooth_r))
 {
        Mesh *me = userData;
 
@@ -6384,8 +6424,8 @@ static void bbs_mesh_solid(Scene *scene, View3D *v3d, Object *ob)
        
        glColor3ub(0, 0, 0);
                
-       if(face_sel_mode)       dm->drawMappedFaces(dm, bbs_mesh_solid_hide__setDrawOpts, me, 0);
-       else                            dm->drawMappedFaces(dm, bbs_mesh_solid__setDrawOpts, me, 0);
+       if(face_sel_mode)       dm->drawMappedFaces(dm, bbs_mesh_solid_hide__setDrawOpts, me, 0, GPU_enable_material);
+       else                            dm->drawMappedFaces(dm, bbs_mesh_solid__setDrawOpts, me, 0, GPU_enable_material);
 
        dm->release(dm);
 }
@@ -6492,7 +6532,7 @@ static void draw_object_mesh_instance(Scene *scene, View3D *v3d, RegionView3D *r
                        GPU_end_object_materials();
                }
                else if(edm)
-                       edm->drawMappedFaces(edm, NULL, NULL, 0);
+                       edm->drawMappedFaces(edm, NULL, NULL, 0, GPU_enable_material);
                
                glDisable(GL_LIGHTING);
        }
@@ -6511,7 +6551,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(rv3d, rv3d->viewmatob, ob->empty_drawsize, 0, ob->empty_drawtype);
+                       drawaxes(ob->empty_drawsize, ob->empty_drawtype);
                        break;
        }
 }