diff options
| author | Daniel Stokes <kupomail@gmail.com> | 2012-04-29 04:33:24 +0400 |
|---|---|---|
| committer | Daniel Stokes <kupomail@gmail.com> | 2012-04-29 04:33:24 +0400 |
| commit | afb8fffb1827a4fffc8e6b3d620a02f59b62e3a9 (patch) | |
| tree | 328e3c204210d68392805f371ef4d296175b6b6e /source/blender/editors/space_image/image_ops.c | |
| parent | f306b50700b05707f44b5472ac0b38d58fb01b0d (diff) | |
| parent | 72ec4c813a2c544341d0c4ae83369cea60e52c9e (diff) | |
Merged revisions 45967-46052 from trunk/blendersoc-2011-cucumber
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; |