blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Fix T80705: Single Image Texture Painting Crash 

Regression introduced by {D8234}; GPU textures can be requested without
an image user.
This commit is contained in:
Jeroen Bakker 2020-09-14 10:45:20 +02:00
parent 211d213160
commit 28c2032579
Notes: blender-bot 2023-02-14 00:29:15 +01:00 
Referenced by issue #80705, Texture Paint, New Single image, Segmentation fault: 11
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/image_gpu.c
View File

@ -272,10 +272,14 @@ static GPUTexture *image_get_gpu_texture(Image *ima,
* context and might as well ensure we have as much space free as possible. */
gpu_free_unused_buffers();
/* Free GPU textures when requesting a different render pass/layer. */
if (ima->gpu_pass != iuser->pass || ima->gpu_layer != iuser->layer) {
ima->gpu_pass = iuser->pass;
ima->gpu_layer = iuser->layer;
/* Free GPU textures when requesting a different render pass/layer.
* When `iuser` isn't set (texture painting single image mode) we assume that
* the current `pass` and `layer` should be 0. */
short requested_pass = iuser ? iuser->pass : 0;
short requested_layer = iuser ? iuser->layer : 0;
if (ima->gpu_pass != requested_pass || ima->gpu_layer != requested_layer) {
ima->gpu_pass = requested_pass;
ima->gpu_layer = requested_layer;
ima->gpuflag |= IMA_GPU_REFRESH;
}