From 1079742db92576d79ec89a28d95336aff847a82a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 27 Feb 2019 12:02:02 +1100 Subject: Cleanup: rename lamp -> light --- source/blender/collada/BCAnimationSampler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/collada/BCAnimationSampler.cpp') 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); -- cgit v1.2.3