diff options
| author | Matt Ebb <matt@mke3.net> | 2004-07-16 06:10:29 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2004-07-16 06:10:29 +0400 |
| commit | 146021ea2eba641285167814dae99cef79d7d419 (patch) | |
| tree | 59595491b0bfb257b06dd33093d7dd9b4e9cae5c /source/blender/src/drawview.c | |
| parent | 688a6de8789989522d1faf61349fc864b962137e (diff) | |
Details, details...
* Renamed the paint color picker panel to 'Paint' instead of 'Transform Properties'
* Minor label edits to the pivot icon menu
Diffstat (limited to 'source/blender/src/drawview.c')
| -rw-r--r-- | source/blender/src/drawview.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 8d6dcc649e4..9ec2c4926d2 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -1467,7 +1467,12 @@ static void view3d_panel_object(short cntrl) // VIEW3D_HANDLER_OBJECT block= uiNewBlock(&curarea->uiblocks, "view3d_panel_object", UI_EMBOSS, UI_HELV, curarea->win); uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE | cntrl); uiSetPanelHandler(VIEW3D_HANDLER_OBJECT); // for close and esc - if(uiNewPanel(curarea, block, "Transform Properties", "View3d", 10, 230, 318, 204)==0) return; + + if (G.f & (G_VERTEXPAINT|G_TEXTUREPAINT)) { + if(uiNewPanel(curarea, block, "Paint", "View3d", 10, 230, 318, 204)==0) return; + } else { + if(uiNewPanel(curarea, block, "Transform Properties", "View3d", 10, 230, 318, 204)==0) return; + } if((G.f & (G_VERTEXPAINT|G_TEXTUREPAINT))==0) { uiDefBut(block, TEX, B_IDNAME, "OB: ", 10,180,140,20, ob->id.name+2, 0.0, 18.0, 0, 0, ""); |