diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 04:02:02 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 04:26:49 +0300 |
commit | 1079742db92576d79ec89a28d95336aff847a82a (patch) | |
tree | 2e440e498c20d3205c2a64eedf4f84bf57abcb84 /source/blender/collada/DocumentImporter.cpp | |
parent | 918941483f7ec5fc6320d345c755e953b963c710 (diff) |
Cleanup: rename lamp -> light
Diffstat (limited to 'source/blender/collada/DocumentImporter.cpp')
-rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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; } |