diff options
| -rw-r--r-- | source/blender/src/drawview.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 9ec2c4926d2..f5a915f171e 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -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; |