diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-12-20 16:29:35 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-12-20 16:29:35 +0300 |
| commit | 5f7ad7081157ff104320e2a51a1acb0bb679ad04 (patch) | |
| tree | 917291be0042c64db24afdd71a06962f53e49b9e /source/blender/editors/space_view3d/drawobject.c | |
| parent | cc80111b2bb9ccf62064979ae527cb2da10e4c31 (diff) | |
2.5
Put back armature drawing code.
The BIF_editarmature.h is a placeholder... need it to get it work.
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index ca813e919fc..99adea5467e 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -133,7 +133,6 @@ void EM_init_index_arrays(int x, int y, int z) {} // XXX void EM_free_index_arrays(void) {} // XXX #define EM_FGON 0 EditFace *EM_get_actFace(int x) {return NULL;} // XXX -int draw_armature(Base *base, int x, int y) {return 0;} // XXX int em_solidoffs; // XXX int em_wireoffs; int em_vertoffs; @@ -4542,7 +4541,7 @@ static void drawtexspace(Object *ob) } /* draws wire outline */ -static void drawSolidSelect(View3D *v3d, Base *base) +static void drawSolidSelect(Scene *scene, View3D *v3d, Base *base) { Object *ob= base->object; @@ -4562,7 +4561,7 @@ static void drawSolidSelect(View3D *v3d, Base *base) } else if(ob->type==OB_ARMATURE) { if(!(ob->flag & OB_POSEMODE)) - draw_armature(base, OB_WIRE, 0); + draw_armature(scene, v3d, base, OB_WIRE, 0); } glLineWidth(1.0); @@ -4888,7 +4887,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) if((v3d->flag & V3D_SELECT_OUTLINE) && ob->type!=OB_MESH) { if(dt>OB_WIRE && dt<OB_TEXTURE && ob!=G.obedit && (flag && DRAW_SCENESET)==0) { if (!(ob->dtx&OB_DRAWWIRE) && (ob->flag&SELECT) && !(flag&DRAW_PICKING)) { - drawSolidSelect(v3d, base); + drawSolidSelect(scene, v3d, base); } } } @@ -5033,7 +5032,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) break; case OB_ARMATURE: if(dt>OB_WIRE) GPU_enable_material(0, NULL); // we use default material - empty_object= draw_armature(base, dt, flag); + empty_object= draw_armature(scene, v3d, base, dt, flag); if(dt>OB_WIRE) GPU_disable_material(); break; default: |