Rename/move particle shaders
authorLuca Rood <dev@lucarood.com>
Tue, 23 May 2017 12:13:25 +0000 (14:13 +0200)
committerLuca Rood <dev@lucarood.com>
Tue, 23 May 2017 12:20:10 +0000 (14:20 +0200)
source/blender/draw/CMakeLists.txt
source/blender/draw/engines/clay/clay_engine.c
source/blender/draw/engines/clay/shaders/clay_particle_strand_frag.glsl [moved from source/blender/draw/engines/clay/shaders/particle_strand_frag.glsl with 100% similarity]
source/blender/draw/engines/clay/shaders/clay_particle_vert.glsl [moved from source/blender/draw/engines/clay/shaders/particle_vert.glsl with 100% similarity]
source/blender/draw/modes/object_mode.c
source/blender/draw/modes/shaders/object_particle_prim_frag.glsl [moved from source/blender/draw/engines/clay/shaders/particle_prim_frag.glsl with 100% similarity]
source/blender/draw/modes/shaders/object_particle_prim_vert.glsl [moved from source/blender/draw/engines/clay/shaders/particle_prim_vert.glsl with 100% similarity]

index 597e89a7d1b19ca7caf77be640bd2f673bacb05c..4b4307f2bd5ddb9ce56000ca163b4a7f39cb1e8b 100644 (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)
index c0f247c9501453b12fda967e35613c05dd4e2df8..259b65c1b96b9941823f0f33162adb7268f36ee6 100644 (file)
 
 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");
        }
 
index 9d6810ab9666fc11d9306639181d6587bb8f0ce3..dbc18e19b41b8c115d8089d6d47a0540f5733eb0 100644 (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) {