diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-01-17 01:40:15 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-01-17 01:40:15 +0300 |
| commit | 265950083566b78175a18df858a27550489dd117 (patch) | |
| tree | c8e1be17b3f31b0b6672294e47aba31546001a82 /source/blender/draw/modes/edit_mesh_mode.c | |
| parent | 96138daa2bd4e82c7d326a5cfc2a6ba042a4a0dd (diff) | |
DRW: Codestyle refactor: Use macro to create shader libs.
This clears up the code from many DynStr usage. Easier to read.
Diffstat (limited to 'source/blender/draw/modes/edit_mesh_mode.c')
| -rw-r--r-- | source/blender/draw/modes/edit_mesh_mode.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c index 1a8c03e3933..110988a8420 100644 --- a/source/blender/draw/modes/edit_mesh_mode.c +++ b/source/blender/draw/modes/edit_mesh_mode.c @@ -156,72 +156,72 @@ static void EDIT_MESH_engine_init(void *vedata) datatoc_edit_mesh_overlay_vert_glsl, datatoc_edit_mesh_overlay_geom_tri_glsl, datatoc_edit_mesh_overlay_frag_glsl, - datatoc_common_globals_lib_glsl, "#define EDGE_FIX\n" "#define ANTI_ALIASING\n" - "#define VERTEX_FACING"); + "#define VERTEX_FACING", + datatoc_common_globals_lib_glsl); } if (!e_data.overlay_tri_fast_sh) { e_data.overlay_tri_fast_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_vert_glsl, datatoc_edit_mesh_overlay_geom_tri_glsl, datatoc_edit_mesh_overlay_frag_glsl, - datatoc_common_globals_lib_glsl, "#define ANTI_ALIASING\n" - "#define VERTEX_FACING\n"); + "#define VERTEX_FACING\n", + datatoc_common_globals_lib_glsl); } if (!e_data.overlay_tri_vcol_sh) { e_data.overlay_tri_vcol_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_vert_glsl, datatoc_edit_mesh_overlay_geom_tri_glsl, datatoc_edit_mesh_overlay_frag_glsl, - datatoc_common_globals_lib_glsl, "#define EDGE_FIX\n" "#define VERTEX_SELECTION\n" "#define ANTI_ALIASING\n" - "#define VERTEX_FACING\n"); + "#define VERTEX_FACING\n", + datatoc_common_globals_lib_glsl); } if (!e_data.overlay_tri_vcol_fast_sh) { e_data.overlay_tri_vcol_fast_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_vert_glsl, datatoc_edit_mesh_overlay_geom_tri_glsl, datatoc_edit_mesh_overlay_frag_glsl, - datatoc_common_globals_lib_glsl, "#define VERTEX_SELECTION\n" "#define ANTI_ALIASING\n" - "#define VERTEX_FACING\n"); + "#define VERTEX_FACING\n", + datatoc_common_globals_lib_glsl); } if (!e_data.overlay_edge_sh) { e_data.overlay_edge_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_vert_glsl, datatoc_edit_mesh_overlay_geom_edge_glsl, datatoc_edit_mesh_overlay_frag_glsl, - datatoc_common_globals_lib_glsl, "#define ANTI_ALIASING\n" - "#define VERTEX_FACING\n"); + "#define VERTEX_FACING\n", + datatoc_common_globals_lib_glsl); } if (!e_data.overlay_edge_vcol_sh) { e_data.overlay_edge_vcol_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_vert_glsl, datatoc_edit_mesh_overlay_geom_edge_glsl, datatoc_edit_mesh_overlay_frag_glsl, - datatoc_common_globals_lib_glsl, "#define VERTEX_SELECTION\n" - "#define VERTEX_FACING\n"); + "#define VERTEX_FACING\n", + datatoc_common_globals_lib_glsl); } if (!e_data.overlay_vert_sh) { e_data.overlay_vert_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_loosevert_vert_glsl, NULL, datatoc_edit_mesh_overlay_frag_glsl, - datatoc_common_globals_lib_glsl, - "#define VERTEX_SELECTION\n"); + "#define VERTEX_SELECTION\n", + datatoc_common_globals_lib_glsl); } if (!e_data.overlay_facedot_sh) { e_data.overlay_facedot_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_facedot_vert_glsl, NULL, datatoc_edit_mesh_overlay_facedot_frag_glsl, - datatoc_common_globals_lib_glsl, - "#define VERTEX_FACING\n"); + "#define VERTEX_FACING\n", + datatoc_common_globals_lib_glsl); } if (!e_data.overlay_mix_sh) { e_data.overlay_mix_sh = DRW_shader_create_fullscreen(datatoc_edit_mesh_overlay_mix_frag_glsl, NULL); @@ -230,27 +230,27 @@ static void EDIT_MESH_engine_init(void *vedata) e_data.overlay_facefill_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_facefill_vert_glsl, NULL, datatoc_edit_mesh_overlay_facefill_frag_glsl, - datatoc_common_globals_lib_glsl, NULL); + NULL, datatoc_common_globals_lib_glsl); } if (!e_data.normals_face_sh) { e_data.normals_face_sh = DRW_shader_create( datatoc_edit_normals_vert_glsl, datatoc_edit_normals_geom_glsl, - datatoc_gpu_shader_uniform_color_frag_glsl, - "#define FACE_NORMALS\n"); + "#define FACE_NORMALS\n", + datatoc_gpu_shader_uniform_color_frag_glsl); } if (!e_data.normals_loop_sh) { e_data.normals_loop_sh = DRW_shader_create( datatoc_edit_normals_vert_glsl, datatoc_edit_normals_geom_glsl, - datatoc_gpu_shader_uniform_color_frag_glsl, - "#define LOOP_NORMALS\n"); + "#define LOOP_NORMALS\n", + datatoc_gpu_shader_uniform_color_frag_glsl); } if (!e_data.normals_sh) { e_data.normals_sh = DRW_shader_create( datatoc_edit_normals_vert_glsl, datatoc_edit_normals_geom_glsl, - datatoc_gpu_shader_uniform_color_frag_glsl, NULL); + NULL, datatoc_gpu_shader_uniform_color_frag_glsl); } if (!e_data.depth_sh) { e_data.depth_sh = DRW_shader_create_3D_depth_only(); |