[Bf-blender-cvs] [1dfd82d] master: Fix T38574 uv sculpting cursor could be visible during render preview in image editor.

[Antony Riakiotakis]

Commit: 1dfd82d2bcdd28e6230878d643c19b93a31cb4cd
Author: Antony Riakiotakis
Date:   Tue Feb 11 12:40:27 2014 +0200
https://developer.blender.org/rB1dfd82d2bcdd28e6230878d643c19b93a31cb4cd

Fix T38574 uv sculpting cursor could be visible during render preview in
image editor.

===================================================================

M       source/blender/editors/sculpt_paint/sculpt_uv.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c 
b/source/blender/editors/sculpt_paint/sculpt_uv.c
index 20f7869..c42e3e4 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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs