Commit: 46d56872d03546f25edfe21b3a82ab72fe6881a4
Author: Campbell Barton
Date: Tue Jan 22 11:24:27 2019 +1100
Branches: master
https://developer.blender.org/rB46d56872d03546f25edfe21b3a82ab72fe6881a4
Fix error in last commit
===================================================================
M source/blender/draw/modes/edit_mesh_mode.c
===================================================================
diff --git a/source/blender/draw/modes/edit_mesh_mode.c
b/source/blender/draw/modes/edit_mesh_mode.c
index 1de00805716..c31cd62262f 100644
--- a/source/blender/draw/modes/edit_mesh_mode.c
+++ b/source/blender/draw/modes/edit_mesh_mode.c
@@ -250,7 +250,7 @@ static GPUShader *EDIT_MESH_ensure_shader(
char *defines = EDIT_MESH_sh_defines(tsettings, rv3d,
true, false);
sh_data->overlay_tri_cache[index] =
DRW_shader_create_from_arrays({
.vert = (const char *[]){lib,
datatoc_edit_mesh_overlay_vert_glsl, NULL},
- .geom = (const char *[]){lib, fast_mode ? NULL
: datatoc_edit_mesh_overlay_geom_tri_glsl, NULL},
+ .geom = fast_mode ? NULL : (const char
*[]){lib, datatoc_edit_mesh_overlay_geom_tri_glsl, NULL},
.frag = (const char *[]){lib,
datatoc_edit_mesh_overlay_frag_glsl, NULL},
.defs = (const char
*[]){world_clip_def_or_empty, defines, NULL},
});
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
