diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-09-08 19:22:29 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-09-08 19:22:29 +0300 |
| commit | e459bce26bdab33fcaefbbceaa1401d57e360128 (patch) | |
| tree | 2c3f79f29dcb079509c3f2328e14854a93705f41 /source/blender/makesrna | |
| parent | c9d7d9a747b846914ca90b9fc515eee2cfe8c4e8 (diff) | |
| parent | 6fc94d18485a57d262a3301ad6255b60abcfd883 (diff) | |
Merge branch 'master' into cycles-x
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index e44ddb07d53..4a013dc9bd7 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -404,7 +404,7 @@ static void rna_Image_resolution_set(PointerRNA *ptr, const float *values) static int rna_Image_bindcode_get(PointerRNA *ptr) { Image *ima = (Image *)ptr->data; - GPUTexture *tex = ima->gputexture[TEXTARGET_2D][0]; + GPUTexture *tex = ima->gputexture[TEXTARGET_2D][0][IMA_TEXTURE_RESOLUTION_FULL]; return (tex) ? GPU_texture_opengl_bindcode(tex) : 0; } |