Fixed bug #6421, Layout of "Sculpt Properties" panel is broken in CVS

* Removed overlapping buttons (texture controls) from the floating palette for Sculpt Mode.
This commit is contained in:
Nicholas Bishop
2007-03-27 03:52:34 +00:00
parent 469f3e8756
commit 7be47ac0cd

View File

@@ -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;