Cleanup: rename lamp -> light

7 files changed, 20 insertions, 20 deletions

diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index f3a7f8d8d51..ebb2a9da10c 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -721,7 +721,7 @@ const std::string AnimationExporter::get_collada_name(std::string channel_target
 		{ "specular_hardness", "specular_hardness" },
 		{ "alpha", "alpha" },
 
-		/* Lamps */
+		/* Lights */
 		{ "color", "color" },
 		{ "fall_off_angle", "falloff_angle" },
 		{ "spot_size", "falloff_angle" },
diff --git a/source/blender/collada/BCAnimationSampler.cpp b/source/blender/collada/BCAnimationSampler.cpp
index 10a5bb8b031..afc37191e2e 100644
--- a/source/blender/collada/BCAnimationSampler.cpp
+++ b/source/blender/collada/BCAnimationSampler.cpp
@@ -404,7 +404,7 @@ void BCAnimationSampler::initialize_keyframes(BCFrameSet &frameset, Object *ob)
 	frameset.clear();
 	add_keyframes_from(bc_getSceneObjectAction(ob), frameset);
 	add_keyframes_from(bc_getSceneCameraAction(ob), frameset);
-	add_keyframes_from(bc_getSceneLampAction(ob), frameset);
+	add_keyframes_from(bc_getSceneLightAction(ob), frameset);
 
 	for (int a = 0; a < ob->totcol; a++) {
 		Material *ma = give_current_material(ob, a + 1);
@@ -451,12 +451,12 @@ void BCAnimationSampler::initialize_curves(BCAnimationCurveMap &curves, Object *
 		object_type = BC_ANIMATION_TYPE_CAMERA;
 	}
 	else if (ob->type == OB_LAMP) {
-		action = bc_getSceneLampAction(ob);
+		action = bc_getSceneLightAction(ob);
 		object_type = BC_ANIMATION_TYPE_LIGHT;
 	}
 
 	if (action) {
-		/* Add lamp action or Camera action */
+		/* Add light action or Camera action */
 		FCurve *fcu = (FCurve *)action->curves.first;
 		for (; fcu; fcu = fcu->next) {
 			BCCurveKey key(object_type, fcu->rna_path, fcu->array_index);
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 4c6387e5106..a81fa6c5c31 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -377,20 +377,20 @@ Object *DocumentImporter::create_camera_object(COLLADAFW::InstanceCamera *camera
 	return ob;
 }
 
-Object *DocumentImporter::create_lamp_object(COLLADAFW::InstanceLight *lamp, Scene *sce)
+Object *DocumentImporter::create_light_object(COLLADAFW::InstanceLight *lamp, Scene *sce)
 {
 	const COLLADAFW::UniqueId& lamp_uid = lamp->getInstanciatedObjectId();
-	if (uid_lamp_map.find(lamp_uid) == uid_lamp_map.end()) {
+	if (uid_light_map.find(lamp_uid) == uid_light_map.end()) {
 		fprintf(stderr, "Couldn't find light by UID.\n");
 		return NULL;
 	}
 
 	Main *bmain = CTX_data_main(mContext);
 	Object *ob = bc_add_object(bmain, sce, view_layer, OB_LAMP, NULL);
-	Light *la = uid_lamp_map[lamp_uid];
-	Light *old_lamp = (Light *)ob->data;
+	Light *la = uid_light_map[lamp_uid];
+	Light *old_light = (Light *)ob->data;
 	ob->data = la;
-	BKE_id_free_us(bmain, old_lamp);
+	BKE_id_free_us(bmain, old_light);
 	return ob;
 }
 
@@ -563,9 +563,9 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node, COLLA
 			++camera_done;
 		}
 		while (lamp_done < lamp.getCount()) {
-			ob = create_lamp_object(lamp[lamp_done], sce);
+			ob = create_light_object(lamp[lamp_done], sce);
 			if (ob == NULL) {
-				report_unknown_reference(*node, "instance_lamp");
+				report_unknown_reference(*node, "instance_light");
 			}
 			else {
 				objects_done->push_back(ob);
@@ -1117,7 +1117,7 @@ bool DocumentImporter::writeLight(const COLLADAFW::Light *light)
 		}
 	}
 
-	this->uid_lamp_map[light->getUniqueId()] = lamp;
+	this->uid_light_map[light->getUniqueId()] = lamp;
 	this->FW_object_map[light->getUniqueId()] = light;
 	return true;
 }
diff --git a/source/blender/collada/DocumentImporter.h b/source/blender/collada/DocumentImporter.h
index fad06b06e20..1ba1a9c5388 100644
--- a/source/blender/collada/DocumentImporter.h
+++ b/source/blender/collada/DocumentImporter.h
@@ -65,7 +65,7 @@ public:
 
 	/** these should not be here */
 	Object* create_camera_object(COLLADAFW::InstanceCamera*, Scene*);
-	Object* create_lamp_object(COLLADAFW::InstanceLight*, Scene*);
+	Object* create_light_object(COLLADAFW::InstanceLight*, Scene*);
 	Object* create_instance_node(Object*, COLLADAFW::Node*, COLLADAFW::Node*, Scene*, bool);
 	void create_constraints(ExtraTags *et, Object *ob);
 	std::vector<Object *> *write_node(COLLADAFW::Node*, COLLADAFW::Node*, Scene*, Object*, bool);
@@ -156,7 +156,7 @@ private:
 	std::map<COLLADAFW::UniqueId, Material*> uid_material_map;
 	std::map<COLLADAFW::UniqueId, Material*> uid_effect_map;
 	std::map<COLLADAFW::UniqueId, Camera*> uid_camera_map;
-	std::map<COLLADAFW::UniqueId, Light*> uid_lamp_map;
+	std::map<COLLADAFW::UniqueId, Light*> uid_light_map;
 	std::map<Material*, TexIndexTextureArrayMap> material_texture_mapping_map;
 	std::multimap<COLLADAFW::UniqueId, Object*> object_map;
 	std::map<COLLADAFW::UniqueId, COLLADAFW::Node*> node_map;
diff --git a/source/blender/collada/LightExporter.cpp b/source/blender/collada/LightExporter.cpp
index 215775b1758..c1822a8e5f3 100644
--- a/source/blender/collada/LightExporter.cpp
+++ b/source/blender/collada/LightExporter.cpp
@@ -29,7 +29,7 @@
 #include "collada_internal.h"
 
 template<class Functor>
-void forEachLampObjectInExportSet(Scene *sce, Functor &f, LinkNode *export_set)
+void forEachLightObjectInExportSet(Scene *sce, Functor &f, LinkNode *export_set)
 {
 	LinkNode *node;
 	for (node = export_set; node; node = node->next) {
@@ -48,7 +48,7 @@ void LightsExporter::exportLights(Scene *sce)
 {
 	openLibrary();
 
-	forEachLampObjectInExportSet(sce, *this, this->export_settings->export_set);
+	forEachLightObjectInExportSet(sce, *this, this->export_settings->export_set);
 
 	closeLibrary();
 }
@@ -105,7 +105,7 @@ void LightsExporter::operator()(Object *ob)
 		exportBlenderProfile(cla, la);
 		addLight(cla);
 	}
-	// area lamp is not supported
+	// area light is not supported
 	// it will be exported as a local lamp
 	else {
 		COLLADASW::PointLight cla(mSW, la_id, la_name);
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index 66c8f94b6c8..406d4dabc88 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -1016,9 +1016,9 @@ bool bc_is_animated(BCMatrixSampleMap &values)
 
 bool bc_has_animations(Object *ob)
 {
-	/* Check for object,lamp and camera transform animations */
+	/* Check for object, light and camera transform animations */
 	if ((bc_getSceneObjectAction(ob) && bc_getSceneObjectAction(ob)->curves.first) ||
-		(bc_getSceneLampAction(ob) && bc_getSceneLampAction(ob)->curves.first) ||
+		(bc_getSceneLightAction(ob) && bc_getSceneLightAction(ob)->curves.first) ||
 		(bc_getSceneCameraAction(ob) && bc_getSceneCameraAction(ob)->curves.first))
 		return true;
 
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h
index 1e18ac56e5d..9eeedb230e6 100644
--- a/source/blender/collada/collada_utils.h
+++ b/source/blender/collada/collada_utils.h
@@ -91,7 +91,7 @@ inline bAction *bc_getSceneObjectAction(Object *ob)
 }
 
 /* Returns Light Action or NULL */
-inline bAction *bc_getSceneLampAction(Object *ob)
+inline bAction *bc_getSceneLightAction(Object *ob)
 {
 	if (ob->type != OB_LAMP)
 		return NULL;