archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T47635: Texture paint performance regression

Browse Source 
Flipped bindcode check in D1414 caused projection paint to always do full updates.
This commit is contained in:
Campbell Barton
2016-03-02 06:57:26 +11:00
parent b302ed210c
commit 47498c4f05
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/gpu/intern/gpu_draw.c
View File

@@ -1227,8 +1227,11 @@ static bool GPU_check_scaled_image(ImBuf *ibuf, Image *ima, float *frect, int x,
void GPU_paint_update_image(Image *ima, ImageUser *iuser, int x, int y, int w, int h)
{
ImBuf *ibuf = BKE_image_acquire_ibuf(ima, iuser, NULL);
if (ima->repbind || (GPU_get_mipmap() && !GTS.gpu_mipmap) || BKE_image_has_bindcode(ima) || !ibuf ||
if (ima->repbind ||
(!GTS.gpu_mipmap && GPU_get_mipmap()) ||
(ima->bindcode[TEXTARGET_TEXTURE_2D] == 0) ||
(ibuf == NULL) ||
(w == 0) || (h == 0))
{
/* these cases require full reload still */