archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: rename lamp -> light

Browse Source
This commit is contained in:
Campbell Barton
2019-02-27 12:02:02 +11:00
parent 918941483f
commit 1079742db9
69 changed files with 394 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/collada/BCAnimationSampler.cpp
View File

@@ -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);