DNA: rename Lamp -> Light

- BKE_lamp -> BKE_light
- Main.lamp -> light

4 files changed, 16 insertions, 16 deletions

diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index 9bb4cab44ba..1787642e9c3 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -1499,7 +1499,7 @@ static void rna_def_modifier_gpencilhook(BlenderRNA *brna)
 
 	prop = RNA_def_property(srna, "falloff_curve", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "curfalloff");
-	RNA_def_property_ui_text(prop, "Falloff Curve", "Custom Lamp Falloff Curve");
+	RNA_def_property_ui_text(prop, "Falloff Curve", "Custom Light Falloff Curve");
 	RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
 	prop = RNA_def_property(srna, "center", PROP_FLOAT, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c
index ccf49ea3329..aca9c148bcb 100644
--- a/source/blender/makesrna/intern/rna_lamp.c
+++ b/source/blender/makesrna/intern/rna_lamp.c
@@ -50,7 +50,7 @@
 
 static void rna_Light_buffer_size_set(PointerRNA *ptr, int value)
 {
-	Lamp *la = (Lamp *)ptr->data;
+	Light *la = (Light *)ptr->data;
 
 	CLAMP(value, 128, 10240);
 	la->bufsize = value;
@@ -59,7 +59,7 @@ static void rna_Light_buffer_size_set(PointerRNA *ptr, int value)
 
 static StructRNA *rna_Light_refine(struct PointerRNA *ptr)
 {
-	Lamp *la = (Lamp *)ptr->data;
+	Light *la = (Light *)ptr->data;
 
 	switch (la->type) {
 		case LA_LOCAL:
@@ -77,7 +77,7 @@ static StructRNA *rna_Light_refine(struct PointerRNA *ptr)
 
 static void rna_Light_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	Lamp *la = ptr->id.data;
+	Light *la = ptr->id.data;
 
 	DEG_id_tag_update(&la->id, 0);
 	WM_main_add_notifier(NC_LAMP | ND_LIGHTING, la);
@@ -85,7 +85,7 @@ static void rna_Light_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerR
 
 static void rna_Light_draw_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	Lamp *la = ptr->id.data;
+	Light *la = ptr->id.data;
 
 	DEG_id_tag_update(&la->id, 0);
 	WM_main_add_notifier(NC_LAMP | ND_LIGHTING_DRAW, la);
@@ -93,7 +93,7 @@ static void rna_Light_draw_update(Main *UNUSED(bmain), Scene *UNUSED(scene), Poi
 
 static void rna_Light_use_nodes_update(bContext *C, PointerRNA *ptr)
 {
-	Lamp *la = (Lamp *)ptr->data;
+	Light *la = (Light *)ptr->data;
 
 	if (la->use_nodes && la->nodetree == NULL)
 		ED_node_shader_default(C, &la->id);
@@ -118,7 +118,7 @@ static void rna_def_light(BlenderRNA *brna)
 	static float default_color[4] = {1.0f, 1.0f, 1.0f, 1.0f};
 
 	srna = RNA_def_struct(brna, "Light", "ID");
-	RNA_def_struct_sdna(srna, "Lamp");
+	RNA_def_struct_sdna(srna, "Light");
 	RNA_def_struct_refine_func(srna, "rna_Light_refine");
 	RNA_def_struct_ui_text(srna, "Light", "Light data-block for lighting a scene");
 	RNA_def_struct_translation_context(srna, BLT_I18NCONTEXT_ID_LIGHT);
@@ -420,7 +420,7 @@ static void rna_def_point_light(BlenderRNA *brna)
 	StructRNA *srna;
 
 	srna = RNA_def_struct(brna, "PointLight", "Light");
-	RNA_def_struct_sdna(srna, "Lamp");
+	RNA_def_struct_sdna(srna, "Light");
 	RNA_def_struct_ui_text(srna, "Point Light", "Omnidirectional point Light");
 	RNA_def_struct_ui_icon(srna, ICON_LIGHT_POINT);
 
@@ -443,7 +443,7 @@ static void rna_def_area_light(BlenderRNA *brna)
 	};
 
 	srna = RNA_def_struct(brna, "AreaLight", "Light");
-	RNA_def_struct_sdna(srna, "Lamp");
+	RNA_def_struct_sdna(srna, "Light");
 	RNA_def_struct_ui_text(srna, "Area Light", "Directional area Light");
 	RNA_def_struct_ui_icon(srna, ICON_LIGHT_AREA);
 
@@ -481,7 +481,7 @@ static void rna_def_spot_light(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	srna = RNA_def_struct(brna, "SpotLight", "Light");
-	RNA_def_struct_sdna(srna, "Lamp");
+	RNA_def_struct_sdna(srna, "Light");
 	RNA_def_struct_ui_text(srna, "Spot Light", "Directional cone Light");
 	RNA_def_struct_ui_icon(srna, ICON_LIGHT_SPOT);
 
@@ -520,7 +520,7 @@ static void rna_def_sun_light(BlenderRNA *brna)
 	StructRNA *srna;
 
 	srna = RNA_def_struct(brna, "SunLight", "Light");
-	RNA_def_struct_sdna(srna, "Lamp");
+	RNA_def_struct_sdna(srna, "Light");
 	RNA_def_struct_ui_text(srna, "Sun Light", "Constant direction parallel ray Light");
 	RNA_def_struct_ui_icon(srna, ICON_LIGHT_SUN);
 
diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c
index 0d6f69b2179..e0d7fc8b852 100644
--- a/source/blender/makesrna/intern/rna_main.c
+++ b/source/blender/makesrna/intern/rna_main.c
@@ -105,7 +105,7 @@ static void rna_Main_object_begin(CollectionPropertyIterator *iter, PointerRNA *
 static void rna_Main_light_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
 	Main *bmain = (Main *)ptr->data;
-	rna_iterator_listbase_begin(iter, &bmain->lamp, NULL);
+	rna_iterator_listbase_begin(iter, &bmain->light, NULL);
 }
 
 static void rna_Main_library_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
@@ -362,7 +362,7 @@ int rna_Main_mesh_lookup_string(PointerRNA *ptr, const char *key, struct Pointer
 int rna_Main_light_lookup_string(PointerRNA *ptr, const char *key, struct PointerRNA *r_ptr)
 {
 	Main *bmain = ptr->data;
-	return rna_ID_lookup_string(&bmain->lamp, key, r_ptr);
+	return rna_ID_lookup_string(&bmain->light, key, r_ptr);
 }
 
 int rna_Main_library_lookup_string(PointerRNA *ptr, const char *key, struct PointerRNA *r_ptr)
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index c7630b883c6..18efaffaf5d 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -325,12 +325,12 @@ Mesh *rna_Main_meshes_new_from_object(
 	return BKE_mesh_new_from_object(depsgraph, bmain, sce, ob, apply_modifiers, calc_undeformed);
 }
 
-static Lamp *rna_Main_lights_new(Main *bmain, const char *name, int type)
+static Light *rna_Main_lights_new(Main *bmain, const char *name, int type)
 {
 	char safe_name[MAX_ID_NAME - 2];
 	rna_idname_validate(name, safe_name);
 
-	Lamp *lamp = BKE_lamp_add(bmain, safe_name);
+	Light *lamp = BKE_light_add(bmain, safe_name);
 	lamp->type = type;
 	id_us_min(&lamp->id);
 	return lamp;
@@ -617,7 +617,7 @@ RNA_MAIN_ID_TAG_FUNCS_DEF(objects, object, ID_OB)
 RNA_MAIN_ID_TAG_FUNCS_DEF(materials, mat, ID_MA)
 RNA_MAIN_ID_TAG_FUNCS_DEF(node_groups, nodetree, ID_NT)
 RNA_MAIN_ID_TAG_FUNCS_DEF(meshes, mesh, ID_ME)
-RNA_MAIN_ID_TAG_FUNCS_DEF(lights, lamp, ID_LA)
+RNA_MAIN_ID_TAG_FUNCS_DEF(lights, light, ID_LA)
 RNA_MAIN_ID_TAG_FUNCS_DEF(libraries, library, ID_LI)
 RNA_MAIN_ID_TAG_FUNCS_DEF(screens, screen, ID_SCR)
 RNA_MAIN_ID_TAG_FUNCS_DEF(window_managers, wm, ID_WM)