diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 22:25:35 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 22:29:20 +0300 |
| commit | 3984586292855bb6710facf5845b44f5d11dcc6f (patch) | |
| tree | c649e5d521ad4f9012276fcf0175f4e75db22bb7 /source/blender/makesrna | |
| parent | 35c6d68d35699fe088537074ebaa5034c8e6321e (diff) | |
| parent | e4faed120d9c294ea5d6061b3213ed4f6784db52 (diff) | |
Merge branch 'blender-v2.82-release'
Merge conflict in source/blender/gpu/GPU_texture.h
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_image_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c index cc1a0cff08b..7b5612ef8e7 100644 --- a/source/blender/makesrna/intern/rna_image_api.c +++ b/source/blender/makesrna/intern/rna_image_api.c @@ -222,7 +222,7 @@ static int rna_Image_gl_load(Image *image, ReportList *reports, int frame) BKE_imageuser_default(&iuser); iuser.framenr = frame; - GPUTexture *tex = GPU_texture_from_blender(image, &iuser, GL_TEXTURE_2D); + GPUTexture *tex = GPU_texture_from_blender(image, &iuser, NULL, GL_TEXTURE_2D); if (tex == NULL) { BKE_reportf(reports, RPT_ERROR, "Failed to load image texture '%s'", image->id.name + 2); |