Cleanup: rename lamp -> light

1 files changed, 51 insertions, 51 deletions

diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c
index 72729cdd8cc..845cab620bd 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -78,16 +78,16 @@ static struct DRWShapeCache {
 	GPUBatch *drw_field_vortex;
 	GPUBatch *drw_field_tube_limit;
 	GPUBatch *drw_field_cone_limit;
-	GPUBatch *drw_lamp;
-	GPUBatch *drw_lamp_shadows;
-	GPUBatch *drw_lamp_sunrays;
-	GPUBatch *drw_lamp_area_square;
-	GPUBatch *drw_lamp_area_disk;
-	GPUBatch *drw_lamp_hemi;
-	GPUBatch *drw_lamp_spot;
-	GPUBatch *drw_lamp_spot_volume;
-	GPUBatch *drw_lamp_spot_square;
-	GPUBatch *drw_lamp_spot_square_volume;
+	GPUBatch *drw_light;
+	GPUBatch *drw_light_shadows;
+	GPUBatch *drw_light_sunrays;
+	GPUBatch *drw_light_area_square;
+	GPUBatch *drw_light_area_disk;
+	GPUBatch *drw_light_hemi;
+	GPUBatch *drw_light_spot;
+	GPUBatch *drw_light_spot_volume;
+	GPUBatch *drw_light_spot_square;
+	GPUBatch *drw_light_spot_square_volume;
 	GPUBatch *drw_speaker;
 	GPUBatch *drw_lightprobe_cube;
 	GPUBatch *drw_lightprobe_planar;
@@ -1295,13 +1295,13 @@ GPUBatch *DRW_cache_field_cone_limit_get(void)
 /** \} */
 
 /* -------------------------------------------------------------------- */
-/** \name Lamps
+/** \name Lights
  * \{ */
 
-GPUBatch *DRW_cache_lamp_get(void)
+GPUBatch *DRW_cache_light_get(void)
 {
 #define NSEGMENTS 8
-	if (!SHC.drw_lamp) {
+	if (!SHC.drw_light) {
 		float v[2];
 
 		/* Position Only 3D format */
@@ -1324,16 +1324,16 @@ GPUBatch *DRW_cache_lamp_get(void)
 			GPU_vertbuf_attr_set(vbo, attr_id.pos, a + 1, v);
 		}
 
-		SHC.drw_lamp = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);
+		SHC.drw_light = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);
 	}
-	return SHC.drw_lamp;
+	return SHC.drw_light;
 #undef NSEGMENTS
 }
 
-GPUBatch *DRW_cache_lamp_shadows_get(void)
+GPUBatch *DRW_cache_light_shadows_get(void)
 {
 #define NSEGMENTS 10
-	if (!SHC.drw_lamp_shadows) {
+	if (!SHC.drw_light_shadows) {
 		float v[2];
 
 		/* Position Only 3D format */
@@ -1356,15 +1356,15 @@ GPUBatch *DRW_cache_lamp_shadows_get(void)
 			GPU_vertbuf_attr_set(vbo, attr_id.pos, a + 1, v);
 		}
 
-		SHC.drw_lamp_shadows = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);
+		SHC.drw_light_shadows = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);
 	}
-	return SHC.drw_lamp_shadows;
+	return SHC.drw_light_shadows;
 #undef NSEGMENTS
 }
 
-GPUBatch *DRW_cache_lamp_sunrays_get(void)
+GPUBatch *DRW_cache_light_sunrays_get(void)
 {
-	if (!SHC.drw_lamp_sunrays) {
+	if (!SHC.drw_light_sunrays) {
 		float v[2], v1[2], v2[2];
 
 		/* Position Only 2D format */
@@ -1392,14 +1392,14 @@ GPUBatch *DRW_cache_lamp_sunrays_get(void)
 			GPU_vertbuf_attr_set(vbo, attr_id.pos, a * 4 + 3, v2);
 		}
 
-		SHC.drw_lamp_sunrays = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);
+		SHC.drw_light_sunrays = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);
 	}
-	return SHC.drw_lamp_sunrays;
+	return SHC.drw_light_sunrays;
 }
 
-GPUBatch *DRW_cache_lamp_area_square_get(void)
+GPUBatch *DRW_cache_light_area_square_get(void)
 {
-	if (!SHC.drw_lamp_area_square) {
+	if (!SHC.drw_light_area_square) {
 		float v1[3] = {0.0f, 0.0f, 0.0f};
 
 		/* Position Only 3D format */
@@ -1426,15 +1426,15 @@ GPUBatch *DRW_cache_lamp_area_square_get(void)
 		v1[1] = 0.5f;
 		GPU_vertbuf_attr_set(vbo, attr_id.pos, 7, v1);
 
-		SHC.drw_lamp_area_square = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);
+		SHC.drw_light_area_square = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);
 	}
-	return SHC.drw_lamp_area_square;
+	return SHC.drw_light_area_square;
 }
 
-GPUBatch *DRW_cache_lamp_area_disk_get(void)
+GPUBatch *DRW_cache_light_area_disk_get(void)
 {
 #define NSEGMENTS 32
-	if (!SHC.drw_lamp_area_disk) {
+	if (!SHC.drw_light_area_disk) {
 		/* Position Only 3D format */
 		static GPUVertFormat format = { 0 };
 		static struct { uint pos; } attr_id;
@@ -1456,16 +1456,16 @@ GPUBatch *DRW_cache_lamp_area_disk_get(void)
 		copy_v3_fl3(v, 0.0f, 0.5f, 0.0f);
 		GPU_vertbuf_attr_set(vbo, attr_id.pos, (2 * NSEGMENTS) - 1, v);
 
-		SHC.drw_lamp_area_disk = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);
+		SHC.drw_light_area_disk = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);
 	}
-	return SHC.drw_lamp_area_disk;
+	return SHC.drw_light_area_disk;
 #undef NSEGMENTS
 }
 
-GPUBatch *DRW_cache_lamp_hemi_get(void)
+GPUBatch *DRW_cache_light_hemi_get(void)
 {
 #define CIRCLE_RESOL 32
-	if (!SHC.drw_lamp_hemi) {
+	if (!SHC.drw_light_hemi) {
 		float v[3];
 		int vidx = 0;
 
@@ -1519,17 +1519,17 @@ GPUBatch *DRW_cache_lamp_hemi_get(void)
 		}
 
 
-		SHC.drw_lamp_hemi = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);
+		SHC.drw_light_hemi = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);
 	}
-	return SHC.drw_lamp_hemi;
+	return SHC.drw_light_hemi;
 #undef CIRCLE_RESOL
 }
 
 
-GPUBatch *DRW_cache_lamp_spot_get(void)
+GPUBatch *DRW_cache_light_spot_get(void)
 {
 #define NSEGMENTS 32
-	if (!SHC.drw_lamp_spot) {
+	if (!SHC.drw_light_spot) {
 		/* a single ring of vertices */
 		float p[NSEGMENTS][2];
 		float n[NSEGMENTS][3];
@@ -1588,16 +1588,16 @@ GPUBatch *DRW_cache_lamp_spot_get(void)
 			GPU_vertbuf_attr_set(vbo, attr_id.n2, i * 4 + 3, neg[(i) % NSEGMENTS]);
 		}
 
-		SHC.drw_lamp_spot = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);
+		SHC.drw_light_spot = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);
 	}
-	return SHC.drw_lamp_spot;
+	return SHC.drw_light_spot;
 #undef NSEGMENTS
 }
 
-GPUBatch *DRW_cache_lamp_spot_volume_get(void)
+GPUBatch *DRW_cache_light_spot_volume_get(void)
 {
 #define NSEGMENTS 32
-	if (!SHC.drw_lamp_spot_volume) {
+	if (!SHC.drw_light_spot_volume) {
 		/* a single ring of vertices */
 		float p[NSEGMENTS][2];
 		for (int i = 0; i < NSEGMENTS; ++i) {
@@ -1633,15 +1633,15 @@ GPUBatch *DRW_cache_lamp_spot_volume_get(void)
 			GPU_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, v);
 		}
 
-		SHC.drw_lamp_spot_volume = GPU_batch_create_ex(GPU_PRIM_TRIS, vbo, NULL, GPU_BATCH_OWNS_VBO);
+		SHC.drw_light_spot_volume = GPU_batch_create_ex(GPU_PRIM_TRIS, vbo, NULL, GPU_BATCH_OWNS_VBO);
 	}
-	return SHC.drw_lamp_spot_volume;
+	return SHC.drw_light_spot_volume;
 #undef NSEGMENTS
 }
 
-GPUBatch *DRW_cache_lamp_spot_square_get(void)
+GPUBatch *DRW_cache_light_spot_square_get(void)
 {
-	if (!SHC.drw_lamp_spot_square) {
+	if (!SHC.drw_light_spot_square) {
 		float p[5][3] = {
 			{ 0.0f,  0.0f,  0.0f},
 			{ 1.0f,  1.0f, -1.0f},
@@ -1670,14 +1670,14 @@ GPUBatch *DRW_cache_lamp_spot_square_get(void)
 			GPU_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, p[((i + 1) % 4) + 1]);
 		}
 
-		SHC.drw_lamp_spot_square = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);
+		SHC.drw_light_spot_square = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO);
 	}
-	return SHC.drw_lamp_spot_square;
+	return SHC.drw_light_spot_square;
 }
 
-GPUBatch *DRW_cache_lamp_spot_square_volume_get(void)
+GPUBatch *DRW_cache_light_spot_square_volume_get(void)
 {
-	if (!SHC.drw_lamp_spot_square_volume) {
+	if (!SHC.drw_light_spot_square_volume) {
 		float p[5][3] = {
 			{ 0.0f,  0.0f,  0.0f},
 			{ 1.0f,  1.0f, -1.0f},
@@ -1704,9 +1704,9 @@ GPUBatch *DRW_cache_lamp_spot_square_volume_get(void)
 			GPU_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, p[(i % 4) + 1]);
 		}
 
-		SHC.drw_lamp_spot_square_volume = GPU_batch_create_ex(GPU_PRIM_TRIS, vbo, NULL, GPU_BATCH_OWNS_VBO);
+		SHC.drw_light_spot_square_volume = GPU_batch_create_ex(GPU_PRIM_TRIS, vbo, NULL, GPU_BATCH_OWNS_VBO);
 	}
-	return SHC.drw_lamp_spot_square_volume;
+	return SHC.drw_light_spot_square_volume;
 }
 
 /** \} */