Commit: 2e350b40342f71ecf4173c0e9264f233bdcc4c59
Author: Brecht Van Lommel
Date: Wed May 22 09:59:52 2019 +0200
Branches: master
https://developer.blender.org/rB2e350b40342f71ecf4173c0e9264f233bdcc4c59
Fix T64965: crash using masks in texture paint mode
===================================================================
M source/blender/draw/modes/paint_texture_mode.c
===================================================================
diff --git a/source/blender/draw/modes/paint_texture_mode.c
b/source/blender/draw/modes/paint_texture_mode.c
index 847d2d2f8aa..ee8ec78e91b 100644
--- a/source/blender/draw/modes/paint_texture_mode.c
+++ b/source/blender/draw/modes/paint_texture_mode.c
@@ -154,6 +154,16 @@ static void PAINT_TEXTURE_engine_init(void *UNUSED(vedata))
.defs = (const char *[]){sh_cfg_data->def, NULL},
});
+ sh_data->image_mask = GPU_shader_create_from_arrays({
+ .vert = (const char *[]){sh_cfg_data->lib,
+ datatoc_common_globals_lib_glsl,
+ datatoc_common_view_lib_glsl,
+ datatoc_paint_texture_vert_glsl,
+ NULL},
+ .frag = (const char *[]){datatoc_paint_texture_frag_glsl, NULL},
+ .defs = (const char *[]){sh_cfg_data->def, "#define
TEXTURE_PAINT_MASK\n", NULL},
+ });
+
sh_data->wire_select_overlay = GPU_shader_create_from_arrays({
.vert = (const char *[]){sh_cfg_data->lib,
datatoc_common_globals_lib_glsl,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
