diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-06-27 12:11:05 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-06-27 12:11:05 +0400 |
| commit | c896fcae7963fb35124ef3fefe0f12679228fa39 (patch) | |
| tree | f4435bd39a36228a71c9142e4c26bacd482683f3 /source/blender/editors/space_view3d/view3d_intern.h | |
| parent | cb12648656fc001e8c4c6d00df73e52d452f8787 (diff) | |
| parent | 93bb6238e0c6b7ea008776f4e1c3958ef5382c09 (diff) | |
Merge with trunk r37849
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_intern.h')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_intern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index 6e0e1f337dd..b99849b5a87 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -124,7 +124,7 @@ void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, int depth_write, floa #define V3D_CACHE_TEXT_ASCII (1<<2) /* drawarmature.c */ -int draw_armature(Scene *scene, View3D *v3d, ARegion *ar, Base *base, int dt, int flag); +int draw_armature(Scene *scene, View3D *v3d, ARegion *ar, Base *base, int dt, int flag, const short is_outline); /* drawmesh.c */ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, struct Object *ob, struct DerivedMesh *dm, int faceselect); |