From 3051e2f4ae8fd3e72a43dd1e5d40893d0efec500 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 27 Feb 2019 10:46:48 +1100 Subject: DNA: rename Lamp -> Light - BKE_lamp -> BKE_light - Main.lamp -> light --- source/blender/collada/AnimationImporter.cpp | 2 +- source/blender/collada/BCAnimationCurve.cpp | 4 ++-- source/blender/collada/DocumentImporter.cpp | 10 +++++----- source/blender/collada/DocumentImporter.h | 2 +- source/blender/collada/LightExporter.cpp | 4 ++-- source/blender/collada/LightExporter.h | 2 +- source/blender/collada/collada_utils.h | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'source/blender/collada') diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index edb796f743f..822e02ad9a3 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -994,7 +994,7 @@ void AnimationImporter::translate_Animations(COLLADAFW::Node *node, } if ((animType->light) != 0) { - Lamp *lamp = (Lamp *) ob->data; + Light *lamp = (Light *) ob->data; if (!lamp->adt || !lamp->adt->action) act = verify_adt_action(bmain, (ID *)&lamp->id, 1); else diff --git a/source/blender/collada/BCAnimationCurve.cpp b/source/blender/collada/BCAnimationCurve.cpp index 180e351d669..064f3254b11 100644 --- a/source/blender/collada/BCAnimationCurve.cpp +++ b/source/blender/collada/BCAnimationCurve.cpp @@ -86,7 +86,7 @@ void BCAnimationCurve::init_pointer_rna(Object *ob) break; case BC_ANIMATION_TYPE_LIGHT: { - Lamp *lamp = (Lamp *)ob->data; + Light *lamp = (Light *)ob->data; RNA_id_pointer_create(&lamp->id, &id_ptr); } break; @@ -175,7 +175,7 @@ const std::string BCAnimationCurve::get_animation_name(Object *ob) const case BC_ANIMATION_TYPE_LIGHT: { - Lamp *lamp = (Lamp *)ob->data; + Light *lamp = (Light *)ob->data; name = id_name(ob) + "-" + id_name(lamp) + "-light"; } break; 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"); diff --git a/source/blender/collada/DocumentImporter.h b/source/blender/collada/DocumentImporter.h index ab3359ed149..fad06b06e20 100644 --- a/source/blender/collada/DocumentImporter.h +++ b/source/blender/collada/DocumentImporter.h @@ -156,7 +156,7 @@ private: std::map uid_material_map; std::map uid_effect_map; std::map uid_camera_map; - std::map uid_lamp_map; + std::map uid_lamp_map; std::map material_texture_mapping_map; std::multimap object_map; std::map node_map; diff --git a/source/blender/collada/LightExporter.cpp b/source/blender/collada/LightExporter.cpp index b410d67bfef..215775b1758 100644 --- a/source/blender/collada/LightExporter.cpp +++ b/source/blender/collada/LightExporter.cpp @@ -55,7 +55,7 @@ void LightsExporter::exportLights(Scene *sce) void LightsExporter::operator()(Object *ob) { - Lamp *la = (Lamp *)ob->data; + Light *la = (Light *)ob->data; std::string la_id(get_light_id(ob)); std::string la_name(id_name(la)); COLLADASW::Color col(la->r * la->energy, la->g * la->energy, la->b * la->energy); @@ -119,7 +119,7 @@ void LightsExporter::operator()(Object *ob) } -bool LightsExporter::exportBlenderProfile(COLLADASW::Light &cla, Lamp *la) +bool LightsExporter::exportBlenderProfile(COLLADASW::Light &cla, Light *la) { cla.addExtraTechniqueParameter("blender", "type", la->type); cla.addExtraTechniqueParameter("blender", "flag", la->flag); diff --git a/source/blender/collada/LightExporter.h b/source/blender/collada/LightExporter.h index 2e67e8cd168..3e5decfdbd8 100644 --- a/source/blender/collada/LightExporter.h +++ b/source/blender/collada/LightExporter.h @@ -37,7 +37,7 @@ public: void exportLights(Scene *sce); void operator()(Object *ob); private: - bool exportBlenderProfile(COLLADASW::Light &cla, Lamp *la); + bool exportBlenderProfile(COLLADASW::Light &cla, Light *la); const ExportSettings *export_settings; }; diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h index fc171d8d3b9..1e18ac56e5d 100644 --- a/source/blender/collada/collada_utils.h +++ b/source/blender/collada/collada_utils.h @@ -90,13 +90,13 @@ inline bAction *bc_getSceneObjectAction(Object *ob) return (ob->adt && ob->adt->action) ? ob->adt->action : NULL; } -/* Returns Lamp Action or NULL */ +/* Returns Light Action or NULL */ inline bAction *bc_getSceneLampAction(Object *ob) { if (ob->type != OB_LAMP) return NULL; - Lamp *lamp = (Lamp *)ob->data; + Light *lamp = (Light *)ob->data; return (lamp->adt && lamp->adt->action) ? lamp->adt->action : NULL; } -- cgit v1.2.3