diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 04:34:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 04:36:32 +0300 |
| commit | 168d3fd528c419b1f877362ef9ffecfc8c790a8a (patch) | |
| tree | 91df8996559512c6abb532f53c1c2c869cf686d9 /source/blender/draw/engines/eevee | |
| parent | 1079742db92576d79ec89a28d95336aff847a82a (diff) | |
Cleanup: file rename lamp -> light
Diffstat (limited to 'source/blender/draw/engines/eevee')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_materials.c | 6 | ||||
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_volumes.c | 4 | ||||
| -rw-r--r-- | source/blender/draw/engines/eevee/shaders/lights_lib.glsl (renamed from source/blender/draw/engines/eevee/shaders/lamps_lib.glsl) | 0 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index eec61ffd08c..5a808f2a01f 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -70,7 +70,7 @@ static struct { float noise_offsets[3]; } e_data = {NULL}; /* Engine data */ -extern char datatoc_lamps_lib_glsl[]; +extern char datatoc_lights_lib_glsl[]; extern char datatoc_lightprobe_lib_glsl[]; extern char datatoc_ambient_occlusion_lib_glsl[]; extern char datatoc_prepass_frag_glsl[]; @@ -553,7 +553,7 @@ void EEVEE_materials_init(EEVEE_ViewLayerData *sldata, EEVEE_StorageList *stl, E datatoc_irradiance_lib_glsl, datatoc_lightprobe_lib_glsl, datatoc_ltc_lib_glsl, - datatoc_lamps_lib_glsl, + datatoc_lights_lib_glsl, /* Add one for each Closure */ datatoc_lit_surface_frag_glsl, datatoc_lit_surface_frag_glsl, @@ -576,7 +576,7 @@ void EEVEE_materials_init(EEVEE_ViewLayerData *sldata, EEVEE_StorageList *stl, E datatoc_irradiance_lib_glsl, datatoc_lightprobe_lib_glsl, datatoc_ltc_lib_glsl, - datatoc_lamps_lib_glsl, + datatoc_lights_lib_glsl, datatoc_volumetric_lib_glsl, datatoc_volumetric_frag_glsl); diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index 53c08c4d8f3..cf12863565f 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -66,7 +66,7 @@ extern char datatoc_common_uniforms_lib_glsl[]; extern char datatoc_common_view_lib_glsl[]; extern char datatoc_octahedron_lib_glsl[]; extern char datatoc_irradiance_lib_glsl[]; -extern char datatoc_lamps_lib_glsl[]; +extern char datatoc_lights_lib_glsl[]; extern char datatoc_volumetric_frag_glsl[]; extern char datatoc_volumetric_geom_glsl[]; extern char datatoc_volumetric_vert_glsl[]; @@ -90,7 +90,7 @@ static void eevee_create_shader_volumes(void) datatoc_bsdf_common_lib_glsl, datatoc_octahedron_lib_glsl, datatoc_irradiance_lib_glsl, - datatoc_lamps_lib_glsl, + datatoc_lights_lib_glsl, datatoc_volumetric_lib_glsl); e_data.volumetric_clear_sh = DRW_shader_create_with_lib( diff --git a/source/blender/draw/engines/eevee/shaders/lamps_lib.glsl b/source/blender/draw/engines/eevee/shaders/lights_lib.glsl index e12d76596d3..e12d76596d3 100644 --- a/source/blender/draw/engines/eevee/shaders/lamps_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/lights_lib.glsl |