diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2005-07-15 21:55:19 +0400 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2005-07-15 21:55:19 +0400 |
| commit | 0be013010fa5acc19c34a516e3f8e62f4f0c80d7 (patch) | |
| tree | 549f693dd3ca03eaca75dfea749b2578b569de5b /source/blender/src/header_info.c | |
| parent | 5263d588c10a252a6bac9f14e521adef4c90cdab (diff) | |
- decided it made more sense to make a key_get_active function, switched
to that in editmesh as well as for edit{curve,lattice}
- added a G.editModeTitleExtra string that gets displayed in header info
string in editmode. currently used to display "(Key)" when editing a
key (before there was not UI level display of this info).
Diffstat (limited to 'source/blender/src/header_info.c')
| -rw-r--r-- | source/blender/src/header_info.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c index d2c41417f88..bfc9c8517ba 100644 --- a/source/blender/src/header_info.c +++ b/source/blender/src/header_info.c @@ -1775,25 +1775,27 @@ static void info_text(int x, int y) int hsize; if(G.obedit) { + char *s = infostr; + + s+= sprintf(s, "%s", G.editModeTitleExtra); if(G.obedit->type==OB_MESH) { if(G.scene->selectmode & SCE_SELECT_VERTEX) - sprintf(infostr,"Ve:%d-%d | Ed:%d-%d | Fa:%d-%d | Mem:%.2fM ", - G.totvertsel, G.totvert, G.totedgesel, G.totedge, G.totfacesel, G.totface, (mem_in_use>>10)/1024.0); + s+= sprintf(s,"Ve:%d-%d | Ed:%d-%d | Fa:%d-%d", + G.totvertsel, G.totvert, G.totedgesel, G.totedge, G.totfacesel, G.totface); else if(G.scene->selectmode & SCE_SELECT_EDGE) - sprintf(infostr,"Ed:%d-%d | Fa:%d-%d | Mem:%.2fM ", - G.totedgesel, G.totedge, G.totfacesel, G.totface, (mem_in_use>>10)/1024.0); + s+= sprintf(s,"Ed:%d-%d | Fa:%d-%d", + G.totedgesel, G.totedge, G.totfacesel, G.totface); else - sprintf(infostr,"Fa:%d-%d | Mem:%.2fM ", - G.totfacesel, G.totface, (mem_in_use>>10)/1024.0); + s+= sprintf(s,"Fa:%d-%d", G.totfacesel, G.totface); } else if(G.obedit->type==OB_ARMATURE) { - sprintf(infostr,"Ve:%d-%d | Bo:%d-%d | Mem:%.2fM ", - G.totvertsel, G.totvert, G.totbonesel, G.totbone, (mem_in_use>>10)/1024.0); + s+= sprintf(s,"Ve:%d-%d | Bo:%d-%d", G.totvertsel, G.totvert, G.totbonesel, G.totbone); } else { - sprintf(infostr,"Ve:%d-%d | Mem:%.2fM ", - G.totvertsel, G.totvert, (mem_in_use>>10)/1024.0); + s+= sprintf(s,"Ve:%d-%d", G.totvertsel, G.totvert); } + + sprintf(s," | Mem:%.2fM", (mem_in_use>>10)/1024.0); } else if(G.obpose) { sprintf(infostr,"Bo:%d-%d | Mem:%.2fM ", |