Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2014-02-11 14:40:27 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-02-11 14:40:50 +0400
commit1dfd82d2bcdd28e6230878d643c19b93a31cb4cd (patch)
tree433177f1e6ccc95d0001ffeee67017a5d5541941 /source/blender/editors/sculpt_paint/sculpt_uv.c
parent10a0b1b8c3e683e562451065aa62bc72a99c8918 (diff)
Fix T38574 uv sculpting cursor could be visible during render preview in
image editor.
Diffstat (limited to 'source/blender/editors/sculpt_paint/sculpt_uv.c')
-rw-r--r--source/blender/editors/sculpt_paint/sculpt_uv.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c
index 20f78690188..c42e3e4b298 100644
--- a/source/blender/editors/sculpt_paint/sculpt_uv.c
+++ b/source/blender/editors/sculpt_paint/sculpt_uv.c
@@ -167,13 +167,14 @@ static int uv_sculpt_brush_poll(bContext *C)
Scene *scene = CTX_data_scene(C);
ToolSettings *toolsettings = scene->toolsettings;
- if (!uv_sculpt_brush(C) || !obedit || obedit->type != OB_MESH)
+ if (!uv_sculpt_brush(C) || !obedit || obedit->type != OB_MESH ||
+ !sima || ED_space_image_show_render(sima) || (sima->mode == SI_MODE_PAINT))
return 0;
em = BKE_editmesh_from_object(obedit);
ret = EDBM_mtexpoly_check(em);
- if (ret && sima) {
+ if (ret) {
ARegion *ar = CTX_wm_region(C);
if ((toolsettings->use_uv_sculpt) && ar->regiontype == RGN_TYPE_WINDOW)
return 1;