diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2007-03-27 07:52:34 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2007-03-27 07:52:34 +0400 |
| commit | 7be47ac0cd84557d8df9fc65acb7130a8e35c893 (patch) | |
| tree | 3a48828f1624ed5956342b8b227ffa4a014cc46c | |
| parent | 469f3e87561aa73b612c87584da415a84d49d9f9 (diff) | |
Fixed bug #6421, Layout of "Sculpt Properties" panel is broken in CVS
* Removed overlapping buttons (texture controls) from the floating palette for Sculpt Mode.
| -rw-r--r-- | source/blender/src/drawview.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 9ab0a20ea90..4c2f33cc84e 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -2180,11 +2180,8 @@ static void view3d_panel_object(short cntrl) // VIEW3D_HANDLER_OBJECT uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE | cntrl); uiSetPanelHandler(VIEW3D_HANDLER_OBJECT); // for close and esc - if((G.f & G_SCULPTMODE) && !G.obedit) { - if(!uiNewPanel(curarea, block, "Transform Properties", "View3d", 10, 230, 425, 234)) return; - } else { - if(!uiNewPanel(curarea, block, "Transform Properties", "View3d", 10, 230, 318, 204)) return; - } + if(!uiNewPanel(curarea, block, "Transform Properties", "View3d", 10, 230, 318, 204)) + return; if(ob->id.lib) uiSetButLock(1, "Can't edit library data"); @@ -2235,7 +2232,6 @@ static void view3d_panel_object(short cntrl) // VIEW3D_HANDLER_OBJECT else if(G.f & G_SCULPTMODE) { uiNewPanelTitle(block, "Sculpt Properties"); sculptmode_draw_interface_tools(block,10,150); - sculptmode_draw_interface_textures(block,220,150); } else { BoundBox *bb = NULL; |