Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r--source/blender/blenloader/intern/readfile.c12
1 files changed, 6 insertions, 6 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);