diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-28 05:59:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-28 05:59:21 +0400 |
| commit | dc313ff00d8e5c8681fb6d923b3da0d0b7ffbdac (patch) | |
| tree | ba96268c121e5645f48290e1051f54dce99f1bbe /source/blender/editors/space_image/image_ops.c | |
| parent | a299855e34ce4321b2e508646965403f56d6ddc5 (diff) | |
add back lasso tool in the UV editor (Ctrl+LMB / Ctrl+Shift+LMB)
Diffstat (limited to 'source/blender/editors/space_image/image_ops.c')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 2c688990a8f..d9f3ffafb14 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -190,13 +190,14 @@ int space_image_main_area_poll(bContext *C) return 0; } -/* For IMAGE_OT_curves_point_set to avoid sampling when in uv smooth mode */ +/* For IMAGE_OT_curves_point_set to avoid sampling when in uv smooth mode or editmode */ int space_image_main_area_not_uv_brush_poll(bContext *C) { SpaceImage *sima = CTX_wm_space_image(C); + Scene *scene = CTX_data_scene(C); + ToolSettings *toolsettings = scene->toolsettings; - ToolSettings *toolsettings = CTX_data_scene(C)->toolsettings; - if (sima && !toolsettings->uvsculpt) + if (sima && !toolsettings->uvsculpt && !scene->obedit) return 1; return 0; |