Cleanup: rename lamp -> light

8 files changed, 18 insertions, 18 deletions

diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 446eb329910..3cbc81e887a 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -1131,7 +1131,7 @@ void BKE_animdata_main_cb(Main *bmain, ID_AnimData_Edit_Callback func, void *use
 	/* textures */
 	ANIMDATA_NODETREE_IDS_CB(bmain->tex.first, Tex);
 
-	/* lamps */
+	/* lights */
 	ANIMDATA_NODETREE_IDS_CB(bmain->light.first, Light);
 
 	/* materials */
@@ -1230,7 +1230,7 @@ void BKE_animdata_fix_paths_rename_all(ID *ref_id, const char *prefix, const cha
 	/* textures */
 	RENAMEFIX_ANIM_NODETREE_IDS(bmain->tex.first, Tex);
 
-	/* lamps */
+	/* lights */
 	RENAMEFIX_ANIM_NODETREE_IDS(bmain->light.first, Light);
 
 	/* materials */
@@ -3612,7 +3612,7 @@ void BKE_animsys_evaluate_all_animation(Main *main, Depsgraph *depsgraph, Scene
 	/* textures */
 	EVAL_ANIM_NODETREE_IDS(main->tex.first, Tex, ADT_RECALC_ANIM);
 
-	/* lamps */
+	/* lights */
 	EVAL_ANIM_NODETREE_IDS(main->light.first, Light, ADT_RECALC_ANIM);
 
 	/* materials */
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index 8e27b3f288d..ce80aac5596 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -201,7 +201,7 @@ void BKE_camera_params_from_object(CameraParams *params, const Object *ob)
 		params->clip_end = cam->clip_end;
 	}
 	else if (ob->type == OB_LAMP) {
-		/* lamp object */
+		/* light object */
 		Light *la = ob->data;
 		params->lens = 16.0f / tanf(la->spotsize * 0.5f);
 		if (params->lens == 0.0f)
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index b49debc36cc..1813edbafb4 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -615,7 +615,7 @@ static const char *camera_adrcodes_to_paths(int adrcode, int *array_index)
 }
 
 /* Light Types */
-static const char *lamp_adrcodes_to_paths(int adrcode, int *array_index)
+static const char *light_adrcodes_to_paths(int adrcode, int *array_index)
 {
 	/* set array index like this in-case nothing sets it correctly  */
 	*array_index = 0;
@@ -842,8 +842,8 @@ static char *get_rna_access(ID *id, int blocktype, int adrcode, char actname[],
 			propname = camera_adrcodes_to_paths(adrcode, &dummy_index);
 			break;
 
-		case ID_LA: /* lamp */
-			propname = lamp_adrcodes_to_paths(adrcode, &dummy_index);
+		case ID_LA: /* light */
+			propname = light_adrcodes_to_paths(adrcode, &dummy_index);
 			break;
 
 		case ID_SO: /* sound */
@@ -1989,7 +1989,7 @@ void do_versions_ipos_to_animato(Main *bmain)
 		}
 	}
 
-	/* lamps */
+	/* lights */
 	for (id = bmain->light.first; id; id = id->next) {
 		Light *la = (Light *)id;
 
diff --git a/source/blender/blenkernel/intern/lamp.c b/source/blender/blenkernel/intern/lamp.c
index 5057daaa35d..318f5e7a046 100644
--- a/source/blender/blenkernel/intern/lamp.c
+++ b/source/blender/blenkernel/intern/lamp.c
@@ -165,7 +165,7 @@ void BKE_light_free(Light *la)
 
 	curvemapping_free(la->curfalloff);
 
-	/* is no lib link block, but lamp extension */
+	/* is no lib link block, but light extension */
 	if (la->nodetree) {
 		ntreeFreeNestedTree(la->nodetree);
 		MEM_freeN(la->nodetree);
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index f99a51c5d68..fdf0265c5f9 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -135,7 +135,7 @@ void BKE_material_init(Material *ma)
 
 	ma->roughness = 0.25f;
 
-	ma->pr_lamp = 3;         /* two lamps, is bits */
+	ma->pr_light = 3;         /* two lights, is bits */
 	ma->pr_type = MA_SPHERE;
 
 	ma->preview = NULL;
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index b8ccd0d9274..83c9697ae1e 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -3550,7 +3550,7 @@ static void registerShaderNodes(void)
 	register_node_type_sh_uvalongstroke();
 	register_node_type_sh_eevee_specular();
 
-	register_node_type_sh_output_lamp();
+	register_node_type_sh_output_light();
 	register_node_type_sh_output_material();
 	register_node_type_sh_output_world();
 	register_node_type_sh_output_linestyle();
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 707daaf0c54..d7ff640bce8 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -715,10 +715,10 @@ void smokeModifier_copy(const struct SmokeModifierData *smd, struct SmokeModifie
 static void smoke_calc_transparency(SmokeDomainSettings *sds, ViewLayer *view_layer);
 static float calc_voxel_transp(float *result, float *input, int res[3], int *pixel, float *tRay, float correct);
 
-static int get_lamp(ViewLayer *view_layer, float *light)
+static int get_light(ViewLayer *view_layer, float *light)
 {
 	Base *base_tmp = NULL;
-	int found_lamp = 0;
+	int found_light = 0;
 
 	// try to find a lamp, preferably local
 	for (base_tmp = FIRSTBASE(view_layer); base_tmp; base_tmp = base_tmp->next) {
@@ -729,14 +729,14 @@ static int get_lamp(ViewLayer *view_layer, float *light)
 				copy_v3_v3(light, base_tmp->object->obmat[3]);
 				return 1;
 			}
-			else if (!found_lamp) {
+			else if (!found_light) {
 				copy_v3_v3(light, base_tmp->object->obmat[3]);
-				found_lamp = 1;
+				found_light = 1;
 			}
 		}
 	}
 
-	return found_lamp;
+	return found_light;
 }
 
 /**********************************************************
@@ -3013,7 +3013,7 @@ static void smoke_calc_transparency(SmokeDomainSettings *sds, ViewLayer *view_la
 	float *density = smoke_get_density(sds->fluid);
 	float correct = -7.0f * sds->dx;
 
-	if (!get_lamp(view_layer, light)) return;
+	if (!get_light(view_layer, light)) return;
 
 	/* convert light pos to sim cell space */
 	mul_m4_v3(sds->imat, light);
diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c
index 221ebbb6bc8..16bfee755f4 100644
--- a/source/blender/blenkernel/intern/studiolight.c
+++ b/source/blender/blenkernel/intern/studiolight.c
@@ -851,7 +851,7 @@ static float blinn_specular(
 	gloss *= 1.0f - wrap;
 	float shininess = exp2(10.0f * gloss + 1.0f);
 
-	/* Pi is already divided in the lamp power.
+	/* Pi is already divided in the light power.
 	 * normalization_factor = (shininess + 8.0) / (8.0 * M_PI) */
 	float normalization_factor = shininess * 0.125f + 1.0f;
 	float spec_light = powf(spec_angle, shininess) * max_ff(NL, 0.0f) * normalization_factor;