[Bf-blender-cvs] [7c4f6e8eae7] greasepencil-object: Fix missing textures when reload
Antonio Vazquez
noreply at git.blender.org
Mon May 8 20:41:23 CEST 2017
Commit: 7c4f6e8eae7f5b1f929d118e6cbd5ee3e12fd139
Author: Antonio Vazquez
Date: Mon May 8 20:23:31 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB7c4f6e8eae7f5b1f929d118e6cbd5ee3e12fd139
Fix missing textures when reload
The texture is not saved in texturelist and is passed directly to shader
===================================================================
M source/blender/draw/engines/gpencil/gpencil_engine.c
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 0f2675a00b4..18114b44eec 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -200,8 +200,8 @@ static DRWShadingGroup *GPENCIL_shgroup_fill_create(GPENCIL_Data *vedata, DRWPas
BKE_image_release_ibuf(image, ibuf, NULL);
}
else {
- txl->texture = GPU_texture_from_blender(palcolor->ima, &iuser, GL_TEXTURE_2D, true, 0.0, 0);
- DRW_shgroup_uniform_texture(grp, "myTexture", txl->texture, 0);
+ GPUTexture *texture = GPU_texture_from_blender(palcolor->ima, &iuser, GL_TEXTURE_2D, true, 0.0, 0);
+ DRW_shgroup_uniform_texture(grp, "myTexture", texture, 0);
// TODO: How apply these parameters
//if (flag & PAC_COLOR_TEX_CLAMP) {
More information about the Bf-blender-cvs
mailing list