blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 744 Projects 19 Wiki Activity

Rename/move particle shaders

This commit is contained in:
Luca Rood 2017-05-23 14:13:25 +02:00
parent 21857cb081
commit b5426b50fb
7 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/draw/CMakeLists.txt
View File

@ -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)

8
source/blender/draw/engines/clay/clay_engine.c
View File

@ -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");
}

0
source/blender/draw/engines/clay/shaders/particle_strand_frag.glsl → source/blender/draw/engines/clay/shaders/clay_particle_strand_frag.glsl
View File

0
source/blender/draw/engines/clay/shaders/particle_vert.glsl → source/blender/draw/engines/clay/shaders/clay_particle_vert.glsl
View File

6
source/blender/draw/modes/object_mode.c
View File

@ -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) {

0
source/blender/draw/engines/clay/shaders/particle_prim_frag.glsl → source/blender/draw/modes/shaders/object_particle_prim_frag.glsl
View File

0
source/blender/draw/engines/clay/shaders/particle_prim_vert.glsl → source/blender/draw/modes/shaders/object_particle_prim_vert.glsl
View File