Cleanup: rename lamp -> light

5 files changed, 13 insertions, 13 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 7370b17b4b4..74aadc00f93 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3973,7 +3973,7 @@ static void direct_link_camera(FileData *fd, Camera *ca)
 /** \name Read ID: Light
  * \{ */
 
-static void lib_link_lamp(FileData *fd, Main *main)
+static void lib_link_light(FileData *fd, Main *main)
 {
 	for (Light *la = main->light.first; la; la = la->id.next) {
 		if (la->id.tag & LIB_TAG_NEED_LINK) {
@@ -3992,7 +3992,7 @@ static void lib_link_lamp(FileData *fd, Main *main)
 	}
 }
 
-static void direct_link_lamp(FileData *fd, Light *la)
+static void direct_link_light(FileData *fd, Light *la)
 {
 	la->adt = newdataadr(fd, la->adt);
 	direct_link_animdata(fd, la->adt);
@@ -9059,7 +9059,7 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, const int ta
 			direct_link_image(fd, (Image *)id);
 			break;
 		case ID_LA:
-			direct_link_lamp(fd, (Light *)id);
+			direct_link_light(fd, (Light *)id);
 			break;
 		case ID_VF:
 			direct_link_vfont(fd, (VFont *)id);
@@ -9323,7 +9323,7 @@ static void lib_link_all(FileData *fd, Main *main)
 	lib_link_ipo(fd, main);        /* XXX deprecated... still needs to be maintained for version patches still */
 	lib_link_key(fd, main);
 	lib_link_world(fd, main);
-	lib_link_lamp(fd, main);
+	lib_link_light(fd, main);
 	lib_link_latt(fd, main);
 	lib_link_text(fd, main);
 	lib_link_camera(fd, main);
@@ -10126,7 +10126,7 @@ static void expand_material(FileData *fd, Main *mainvar, Material *ma)
 	}
 }
 
-static void expand_lamp(FileData *fd, Main *mainvar, Light *la)
+static void expand_light(FileData *fd, Main *mainvar, Light *la)
 {
 	expand_doit(fd, mainvar, la->ipo); // XXX deprecated - old animation system
 
@@ -10692,7 +10692,7 @@ void BLO_expand_main(void *fdhandle, Main *mainvar)
 							expand_lattice(fd, mainvar, (Lattice *)id);
 							break;
 						case ID_LA:
-							expand_lamp(fd, mainvar, (Light *)id);
+							expand_light(fd, mainvar, (Light *)id);
 							break;
 						case ID_KE:
 							expand_key(fd, mainvar, (Key *)id);
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index 6b75203cd31..1a92a75af09 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -1398,7 +1398,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
 		/* Blender 2.5.2 - subversion 0 introduced a new setting: V3D_RENDER_OVERRIDE.
 		 * This bit was used in the past for V3D_TRANSFORM_SNAP, which is now deprecated.
 		 * Here we clear it for old files so they don't come in with V3D_RENDER_OVERRIDE set,
-		 * which would cause cameras, lamps, etc to become invisible */
+		 * which would cause cameras, lights, etc to become invisible */
 		for (sc = bmain->screen.first; sc; sc = sc->id.next) {
 			ScrArea *sa;
 			for (sa = sc->areabase.first; sa; sa = sa->next) {
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 35b826c4bde..4a49dddfd2c 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -326,7 +326,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
 			scene->eevee.motion_blur_shutter = 0.5f;
 		}
 
-		/* Rename lamp objects. */
+		/* Rename light objects. */
 		rename_id_for_versioning(bmain, ID_OB, "Light", "Light");
 		rename_id_for_versioning(bmain, ID_LA, "Light", "Light");
 
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c
index 1899775a6d7..d2aab2bf97b 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -1182,8 +1182,8 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
 		/* Object *ob = bmain->object.first; */
 
 		while (ma) {
-			if (ma->pr_lamp == 0)
-				ma->pr_lamp = 3;
+			if (ma->pr_light == 0)
+				ma->pr_light = 3;
 			ma = ma->id.next;
 		}
 
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 6240fa62e34..42a39ddeca9 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2368,7 +2368,7 @@ static void write_world(WriteData *wd, World *wrld)
 	}
 }
 
-static void write_lamp(WriteData *wd, Light *la)
+static void write_light(WriteData *wd, Light *la)
 {
 	if (la->id.us > 0 || wd->use_memfile) {
 		/* write LibData */
@@ -2383,7 +2383,7 @@ static void write_lamp(WriteData *wd, Light *la)
 			write_curvemapping(wd, la->curfalloff);
 		}
 
-		/* nodetree is integral part of lamps, no libdata */
+		/* Node-tree is integral part of lights, no libdata. */
 		if (la->nodetree) {
 			writestruct(wd, DATA, bNodeTree, 1, la->nodetree);
 			write_nodetree_nolib(wd, la->nodetree);
@@ -3934,7 +3934,7 @@ static bool write_file_handle(
 						write_camera(wd, (Camera *)id);
 						break;
 					case ID_LA:
-						write_lamp(wd, (Light *)id);
+						write_light(wd, (Light *)id);
 						break;
 					case ID_LT:
 						write_lattice(wd, (Lattice *)id);