diff options
| author | Germano <germano.costa@ig.com.br> | 2018-01-29 20:51:23 +0300 |
|---|---|---|
| committer | Germano <germano.costa@ig.com.br> | 2018-01-29 20:51:23 +0300 |
| commit | d072022bbfad5de9c093d472add1514caaa5e2f8 (patch) | |
| tree | 1e6174cc75aa65910724a17b4f0872bd3dd9a292 /source/blender/draw/modes/object_mode.c | |
| parent | 9577ebde79cb5deb696f70fd7d218d8b358b0263 (diff) | |
Deduplicate GLSL frag code in particle drawing
Differential Revision: D2993
Diffstat (limited to 'source/blender/draw/modes/object_mode.c')
| -rw-r--r-- | source/blender/draw/modes/object_mode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 10cbf631561..4aa0d4141e4 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -76,11 +76,11 @@ extern char datatoc_object_empty_image_frag_glsl[]; extern char datatoc_object_empty_image_vert_glsl[]; extern char datatoc_object_lightprobe_grid_vert_glsl[]; extern char datatoc_object_particle_prim_vert_glsl[]; -extern char datatoc_object_particle_prim_frag_glsl[]; extern char datatoc_object_particle_dot_vert_glsl[]; extern char datatoc_object_particle_dot_frag_glsl[]; extern char datatoc_common_globals_lib_glsl[]; extern char datatoc_common_fxaa_lib_glsl[]; +extern char datatoc_gpu_shader_flat_color_frag_glsl[]; extern char datatoc_gpu_shader_fullscreen_vert_glsl[]; extern char datatoc_gpu_shader_uniform_color_frag_glsl[]; @@ -331,12 +331,12 @@ static void OBJECT_engine_init(void *vedata) if (!e_data.part_prim_sh) { e_data.part_prim_sh = DRW_shader_create( - datatoc_object_particle_prim_vert_glsl, NULL, datatoc_object_particle_prim_frag_glsl, NULL); + datatoc_object_particle_prim_vert_glsl, NULL, datatoc_gpu_shader_flat_color_frag_glsl, NULL); } if (!e_data.part_axis_sh) { e_data.part_axis_sh = DRW_shader_create( - datatoc_object_particle_prim_vert_glsl, NULL, datatoc_object_particle_prim_frag_glsl, + datatoc_object_particle_prim_vert_glsl, NULL, datatoc_gpu_shader_flat_color_frag_glsl, "#define USE_AXIS\n"); } |