[Bf-blender-cvs] [395987d2237] greasepencil-refactor: GPencil: Fix parameter missing after merge
Antonio Vazquez
noreply at git.blender.org
Thu Jan 30 10:45:25 CET 2020
Commit: 395987d22370a97922e7917d8471239a1f655876
Author: Antonio Vazquez
Date: Thu Jan 30 10:45:18 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB395987d22370a97922e7917d8471239a1f655876
GPencil: Fix parameter missing after merge
===================================================================
M source/blender/draw/engines/gpencil/gpencil_draw_data.c
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_data.c b/source/blender/draw/engines/gpencil/gpencil_draw_data.c
index ef4efc40ecc..e0126168256 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_data.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_data.c
@@ -72,7 +72,7 @@ static struct GPUTexture *gpencil_image_texture_get(Image *image, bool *r_alpha_
ibuf = BKE_image_acquire_ibuf(image, &iuser, &lock);
if (ibuf != NULL && ibuf->rect != NULL) {
- gpu_tex = GPU_texture_from_blender(image, &iuser, GL_TEXTURE_2D);
+ gpu_tex = GPU_texture_from_blender(image, &iuser, ibuf, GL_TEXTURE_2D);
*r_alpha_premult = (image->alpha_mode == IMA_ALPHA_PREMUL);
}
BKE_image_release_ibuf(image, ibuf, lock);
More information about the Bf-blender-cvs
mailing list