diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2018-04-08 17:56:54 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2018-04-08 19:31:50 +0300 |
commit | 651ea84471bd40d0c700c27faf53a0503bb08147 (patch) | |
tree | 52d81d3ccf5985207c27887304b573aab5ce70f0 /source/blender/draw | |
parent | e9f048052f89d3995ff8555290fa0f4c0ce9126b (diff) |
Clay: Improve loading time.
Only compile hair shader if we need it.
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/engines/clay/clay_engine.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/draw/engines/clay/clay_engine.c b/source/blender/draw/engines/clay/clay_engine.c index c80e0cdf4f7..4976cd01d11 100644 --- a/source/blender/draw/engines/clay/clay_engine.c +++ b/source/blender/draw/engines/clay/clay_engine.c @@ -426,12 +426,6 @@ static void clay_engine_init(void *vedata) e_data.copy_sh = DRW_shader_create_fullscreen(datatoc_clay_copy_glsl, NULL); } - if (!e_data.hair_sh) { - e_data.hair_sh = DRW_shader_create( - datatoc_clay_particle_vert_glsl, NULL, datatoc_clay_particle_strand_frag_glsl, - "#define MAX_MATERIAL 512\n"); - } - if (!stl->storage) { stl->storage = MEM_callocN(sizeof(CLAY_Storage), "CLAY_Storage"); } @@ -604,6 +598,12 @@ static DRWShadingGroup *CLAY_hair_shgroup_create(DRWPass *pass, int id) { CLAY_ViewLayerData *sldata = CLAY_view_layer_data_get(); + if (!e_data.hair_sh) { + e_data.hair_sh = DRW_shader_create( + datatoc_clay_particle_vert_glsl, NULL, datatoc_clay_particle_strand_frag_glsl, + "#define MAX_MATERIAL 512\n"); + } + DRWShadingGroup *grp = DRW_shgroup_create(e_data.hair_sh, pass); DRW_shgroup_uniform_texture(grp, "matcaps", e_data.matcap_array); DRW_shgroup_uniform_block(grp, "material_block", sldata->mat_ubo); |