sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #30170: with file saved in texture painting mode, when going to object mode

Browse Source 
the image texture is missing. The flag to indicate that the mipmap levels were
already loaded into GPU memory was incorrectly set then.
This commit is contained in:
Brecht Van Lommel 2012-02-13 21:12:14 +00:00
parent 19ff61bfb3
commit 873386b22d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -732,6 +732,8 @@ void GPU_paint_set_mipmap(int mipmap)
else
GPU_free_image(ima);
}
else
ima->tpageflag &= ~IMA_MIPMAP_COMPLETE;
}
}
@ -742,6 +744,8 @@ void GPU_paint_set_mipmap(int mipmap)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gpu_get_mipmap_filter(1));
}
else
ima->tpageflag &= ~IMA_MIPMAP_COMPLETE;
}
}
}
@ -939,7 +943,6 @@ void GPU_free_image(Image *ima)
if(ima->bindcode) {
glDeleteTextures(1, (GLuint *)&ima->bindcode);
ima->bindcode= 0;
ima->tpageflag &= ~IMA_MIPMAP_COMPLETE;
}
/* free glsl image binding */
@ -954,8 +957,9 @@ void GPU_free_image(Image *ima)
MEM_freeN(ima->repbind);
ima->repbind= NULL;
ima->tpageflag &= ~IMA_MIPMAP_COMPLETE;
}
ima->tpageflag &= ~IMA_MIPMAP_COMPLETE;
}
void GPU_free_images(void)