svn merge -r 22628:22714 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender-staging.git] / source / blender / editors / preview / previewrender.c
index e273791273d7884c701c4d4e1bcfa84e4cd2affa..d17391811bbb2248786059b8243a18cc8fdcb79d 100644 (file)
@@ -948,7 +948,11 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, M
        /* XXX ugly global still, but we can't do preview while rendering */
        if(G.rendering)
                return;
-
+       
+       if(GS(id->name) == ID_TE) {
+               ntreeTexSetPreviewFlag(1);
+       }
+       
        steve= WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), owner);
        sp= MEM_callocN(sizeof(ShaderPreview), "shader preview");