diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 02:46:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 03:03:16 +0300 |
| commit | 3051e2f4ae8fd3e72a43dd1e5d40893d0efec500 (patch) | |
| tree | 6de62ee531c71705a8d86592770d26f8ecb75d1f /source/blender/collada/DocumentImporter.cpp | |
| parent | ce104ca89643c4b0e6358fd22a2b056ecd603e62 (diff) | |
DNA: rename Lamp -> Light
- BKE_lamp -> BKE_light
- Main.lamp -> light
Diffstat (limited to 'source/blender/collada/DocumentImporter.cpp')
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index f82f1c247b9..4c6387e5106 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -387,8 +387,8 @@ Object *DocumentImporter::create_lamp_object(COLLADAFW::InstanceLight *lamp, Sce Main *bmain = CTX_data_main(mContext); Object *ob = bc_add_object(bmain, sce, view_layer, OB_LAMP, NULL); - Lamp *la = uid_lamp_map[lamp_uid]; - Lamp *old_lamp = (Lamp *)ob->data; + Light *la = uid_lamp_map[lamp_uid]; + Light *old_lamp = (Light *)ob->data; ob->data = la; BKE_id_free_us(bmain, old_lamp); return ob; @@ -983,7 +983,7 @@ bool DocumentImporter::writeLight(const COLLADAFW::Light *light) return true; Main *bmain = CTX_data_main(mContext); - Lamp *lamp = NULL; + Light *lamp = NULL; std::string la_id, la_name; ExtraTags *et = getExtraTags(light->getUniqueId()); @@ -995,8 +995,8 @@ bool DocumentImporter::writeLight(const COLLADAFW::Light *light) la_id = light->getOriginalId(); la_name = light->getName(); - if (la_name.size()) lamp = (Lamp *)BKE_lamp_add(bmain, (char *)la_name.c_str()); - else lamp = (Lamp *)BKE_lamp_add(bmain, (char *)la_id.c_str()); + if (la_name.size()) lamp = (Light *)BKE_light_add(bmain, (char *)la_name.c_str()); + else lamp = (Light *)BKE_light_add(bmain, (char *)la_id.c_str()); if (!lamp) { fprintf(stderr, "Cannot create light.\n"); |