merge from trunk - r17500 to HEAD

[blender-staging.git] / source / blender / src / space.c

diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index e34624a25fecee7f03c4a14365d171a580a2979b..4267159baee6983e8444542ade0830d10e7905df 100644 (file)
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -1307,6 +1307,14 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
                                        }
                                }
                        }
+                       else if (!G.obedit && OBACT && G.f&G_TEXTUREPAINT){
+                               if(G.scene->toolsettings->imapaint.brush &&
+                                       event!=LEFTMOUSE && event!=RIGHTMOUSE && event!=MIDDLEMOUSE &&
+                                       (event==MOUSEY || event==MOUSEX) && bwin_qtest(sa->win)==0) {
+                                       allqueue(REDRAWVIEW3D, 0);
+                               }
+                       }
+                       
 
                        /* Handle retopo painting */
                        if(retopo_mesh_paint_check()) {