Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-01-17 12:35:06 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-01-17 12:39:42 +0300
commit10ce5af2ddf2b06865dcf317fce264be615509e8 (patch)
tree8dabbb3afaa4bf2908b131325282dee4c481f24a /source/blender/draw/modes/paint_weight_mode.c
parent2094bbd033f330dad062cc641a4fa440b6e391a0 (diff)
Revert "Fix use-after free in DRW_shader_create_with_lib"
Caused an error entering edit-mode. d60f26f37a & 2659500835
Diffstat (limited to 'source/blender/draw/modes/paint_weight_mode.c')
-rw-r--r--source/blender/draw/modes/paint_weight_mode.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/modes/paint_weight_mode.c b/source/blender/draw/modes/paint_weight_mode.c
index 067baf6a199..e139b4af97f 100644
--- a/source/blender/draw/modes/paint_weight_mode.c
+++ b/source/blender/draw/modes/paint_weight_mode.c
@@ -102,8 +102,8 @@ static void PAINT_WEIGHT_engine_init(void *UNUSED(vedata))
if (!e_data.wire_overlay_shader) {
e_data.wire_overlay_shader = DRW_shader_create_with_lib(
datatoc_paint_wire_vert_glsl, NULL,
- datatoc_paint_wire_frag_glsl, "#define WEIGHT_MODE\n",
- datatoc_common_globals_lib_glsl);
+ datatoc_paint_wire_frag_glsl,
+ datatoc_common_globals_lib_glsl, "#define WEIGHT_MODE\n");
}
if (!e_data.face_overlay_shader) {
@@ -113,8 +113,8 @@ static void PAINT_WEIGHT_engine_init(void *UNUSED(vedata))
if (!e_data.vert_overlay_shader) {
e_data.vert_overlay_shader = DRW_shader_create_with_lib(
datatoc_paint_wire_vert_glsl, NULL,
- datatoc_paint_vert_frag_glsl, NULL,
- datatoc_common_globals_lib_glsl);
+ datatoc_paint_vert_frag_glsl,
+ datatoc_common_globals_lib_glsl, NULL);
}
}