Give the correct N key panel name when in vertex paint + edit mode (#1451 thanks...
authorMatt Ebb <matt@mke3.net>
Mon, 19 Jul 2004 00:24:56 +0000 (00:24 +0000)
committerMatt Ebb <matt@mke3.net>
Mon, 19 Jul 2004 00:24:56 +0000 (00:24 +0000)
source/blender/src/drawview.c

index 9ec2c4926d2e0198f480460599dcdac8e2ea59dc..f5a915f171e35a557f28fb869243966388b829a9 100644 (file)
@@ -1468,7 +1468,7 @@ 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_VERTEXPAINT|G_TEXTUREPAINT)) {
+       if ((ob!=G.obedit) && (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;