diff options
| -rw-r--r-- | source/blender/draw/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | source/blender/draw/engines/clay/clay_engine.c | 8 | ||||
| -rw-r--r-- | source/blender/draw/engines/clay/shaders/clay_particle_strand_frag.glsl (renamed from source/blender/draw/engines/clay/shaders/particle_strand_frag.glsl) | 0 | ||||
| -rw-r--r-- | source/blender/draw/engines/clay/shaders/clay_particle_vert.glsl (renamed from source/blender/draw/engines/clay/shaders/particle_vert.glsl) | 0 | ||||
| -rw-r--r-- | source/blender/draw/modes/object_mode.c | 6 | ||||
| -rw-r--r-- | source/blender/draw/modes/shaders/object_particle_prim_frag.glsl (renamed from source/blender/draw/engines/clay/shaders/particle_prim_frag.glsl) | 0 | ||||
| -rw-r--r-- | source/blender/draw/modes/shaders/object_particle_prim_vert.glsl (renamed from source/blender/draw/engines/clay/shaders/particle_prim_vert.glsl) | 0 |
7 files changed, 10 insertions, 12 deletions
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 597e89a7d1b..4b4307f2bd5 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -107,12 +107,10 @@ endif() data_to_c_simple(engines/clay/shaders/clay_frag.glsl SRC) data_to_c_simple(engines/clay/shaders/clay_vert.glsl SRC) +data_to_c_simple(engines/clay/shaders/clay_particle_vert.glsl SRC) +data_to_c_simple(engines/clay/shaders/clay_particle_strand_frag.glsl SRC) data_to_c_simple(engines/clay/shaders/ssao_alchemy.glsl SRC) data_to_c_simple(engines/clay/shaders/ssao_groundtruth.glsl SRC) -data_to_c_simple(engines/clay/shaders/particle_vert.glsl SRC) -data_to_c_simple(engines/clay/shaders/particle_strand_frag.glsl SRC) -data_to_c_simple(engines/clay/shaders/particle_prim_vert.glsl SRC) -data_to_c_simple(engines/clay/shaders/particle_prim_frag.glsl SRC) data_to_c_simple(engines/eevee/shaders/default_frag.glsl SRC) data_to_c_simple(engines/eevee/shaders/default_world_frag.glsl SRC) @@ -164,6 +162,8 @@ data_to_c_simple(modes/shaders/object_outline_expand_frag.glsl SRC) data_to_c_simple(modes/shaders/object_outline_detect_frag.glsl SRC) data_to_c_simple(modes/shaders/object_grid_frag.glsl SRC) data_to_c_simple(modes/shaders/object_grid_vert.glsl SRC) +data_to_c_simple(modes/shaders/object_particle_prim_vert.glsl SRC) +data_to_c_simple(modes/shaders/object_particle_prim_frag.glsl SRC) data_to_c_simple(modes/shaders/paint_texture_frag.glsl SRC) data_to_c_simple(modes/shaders/paint_texture_vert.glsl SRC) data_to_c_simple(modes/shaders/paint_wire_frag.glsl SRC) diff --git a/source/blender/draw/engines/clay/clay_engine.c b/source/blender/draw/engines/clay/clay_engine.c index c0f247c9501..259b65c1b96 100644 --- a/source/blender/draw/engines/clay/clay_engine.c +++ b/source/blender/draw/engines/clay/clay_engine.c @@ -55,11 +55,9 @@ extern char datatoc_clay_frag_glsl[]; extern char datatoc_clay_vert_glsl[]; +extern char datatoc_clay_particle_vert_glsl[]; +extern char datatoc_clay_particle_strand_frag_glsl[]; extern char datatoc_ssao_alchemy_glsl[]; -extern char datatoc_particle_vert_glsl[]; -extern char datatoc_particle_strand_frag_glsl[]; -extern char datatoc_particle_prim_vert_glsl[]; -extern char datatoc_particle_prim_frag_glsl[]; /* *********** LISTS *********** */ @@ -364,7 +362,7 @@ static void CLAY_engine_init(void *vedata) if (!e_data.hair_sh) { e_data.hair_sh = DRW_shader_create( - datatoc_particle_vert_glsl, NULL, datatoc_particle_strand_frag_glsl, + datatoc_clay_particle_vert_glsl, NULL, datatoc_clay_particle_strand_frag_glsl, "#define MAX_MATERIAL 512\n"); } diff --git a/source/blender/draw/engines/clay/shaders/particle_strand_frag.glsl b/source/blender/draw/engines/clay/shaders/clay_particle_strand_frag.glsl index 980a1e4690d..980a1e4690d 100644 --- a/source/blender/draw/engines/clay/shaders/particle_strand_frag.glsl +++ b/source/blender/draw/engines/clay/shaders/clay_particle_strand_frag.glsl diff --git a/source/blender/draw/engines/clay/shaders/particle_vert.glsl b/source/blender/draw/engines/clay/shaders/clay_particle_vert.glsl index b28b3cadd6f..b28b3cadd6f 100644 --- a/source/blender/draw/engines/clay/shaders/particle_vert.glsl +++ b/source/blender/draw/engines/clay/shaders/clay_particle_vert.glsl diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 9d6810ab966..dbc18e19b41 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -66,8 +66,8 @@ extern char datatoc_object_grid_frag_glsl[]; extern char datatoc_object_grid_vert_glsl[]; extern char datatoc_object_empty_image_frag_glsl[]; extern char datatoc_object_empty_image_vert_glsl[]; -extern char datatoc_particle_prim_vert_glsl[]; -extern char datatoc_particle_prim_frag_glsl[]; +extern char datatoc_object_particle_prim_vert_glsl[]; +extern char datatoc_object_particle_prim_frag_glsl[]; extern char datatoc_common_globals_lib_glsl[]; /* *********** LISTS *********** */ @@ -286,7 +286,7 @@ static void OBJECT_engine_init(void *vedata) } if (!e_data.part_prim_sh) { - e_data.part_prim_sh = DRW_shader_create(datatoc_particle_prim_vert_glsl, NULL, datatoc_particle_prim_frag_glsl, NULL); + e_data.part_prim_sh = DRW_shader_create(datatoc_object_particle_prim_vert_glsl, NULL, datatoc_object_particle_prim_frag_glsl, NULL); } if (!e_data.part_dot_sh) { diff --git a/source/blender/draw/engines/clay/shaders/particle_prim_frag.glsl b/source/blender/draw/modes/shaders/object_particle_prim_frag.glsl index 50572f293d9..50572f293d9 100644 --- a/source/blender/draw/engines/clay/shaders/particle_prim_frag.glsl +++ b/source/blender/draw/modes/shaders/object_particle_prim_frag.glsl diff --git a/source/blender/draw/engines/clay/shaders/particle_prim_vert.glsl b/source/blender/draw/modes/shaders/object_particle_prim_vert.glsl index 2483ca5b2d2..2483ca5b2d2 100644 --- a/source/blender/draw/engines/clay/shaders/particle_prim_vert.glsl +++ b/source/blender/draw/modes/shaders/object_particle_prim_vert.glsl |