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/editors/object/object_add.c | 6 +++--- source/blender/editors/object/object_relations.c | 10 +++++----- source/blender/editors/object/object_select.c | 4 ++-- source/blender/editors/object/object_transform.c | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'source/blender/editors/object') diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index febd8005e4a..61853f05f46 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1115,7 +1115,7 @@ static int object_light_add_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); Object *ob; - Lamp *la; + Light *la; int type = RNA_enum_get(op->ptr, "type"); ushort local_view_bits; float loc[3], rot[3]; @@ -1141,7 +1141,7 @@ static int object_light_add_exec(bContext *C, wmOperator *op) } BKE_object_obdata_size_init(ob, size); - la = (Lamp *)ob->data; + la = (Light *)ob->data; la->type = type; if (BKE_scene_uses_cycles(scene)) { @@ -2351,7 +2351,7 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, ViewLayer if (dupflag & USER_DUP_LAMP) { ID_NEW_REMAP_US2(obn->data) else { - obn->data = ID_NEW_SET(obn->data, BKE_lamp_copy(bmain, obn->data)); + obn->data = ID_NEW_SET(obn->data, BKE_light_copy(bmain, obn->data)); didit = 1; } id_us_min(id); diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 7cb83834b94..de17b3ca281 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -1180,7 +1180,7 @@ static int track_set_exec(bContext *C, wmOperator *op) data->tar = obact; DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION); - /* Lamp, Camera and Speaker track differently by default */ + /* Light, Camera and Speaker track differently by default */ if (ELEM(ob->type, OB_LAMP, OB_CAMERA, OB_SPEAKER)) { data->trackflag = TRACK_nZ; } @@ -1203,7 +1203,7 @@ static int track_set_exec(bContext *C, wmOperator *op) data->tar = obact; DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION); - /* Lamp, Camera and Speaker track differently by default */ + /* Light, Camera and Speaker track differently by default */ if (ELEM(ob->type, OB_LAMP, OB_CAMERA, OB_SPEAKER)) { data->reserved1 = TRACK_nZ; data->reserved2 = UP_Y; @@ -1227,7 +1227,7 @@ static int track_set_exec(bContext *C, wmOperator *op) data->tar = obact; DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION); - /* Lamp, Camera and Speaker track differently by default */ + /* Light, Camera and Speaker track differently by default */ if (ELEM(ob->type, OB_LAMP, OB_CAMERA, OB_SPEAKER)) { data->trackflag = TRACK_nZ; data->lockflag = LOCK_Y; @@ -1699,7 +1699,7 @@ static void new_id_matar(Main *bmain, Material **matar, const int totcol) static void single_obdata_users(Main *bmain, Scene *scene, ViewLayer *view_layer, View3D *v3d, const int flag) { - Lamp *la; + Light *la; Curve *cu; /* Camera *cam; */ Mesh *me; @@ -1716,7 +1716,7 @@ static void single_obdata_users(Main *bmain, Scene *scene, ViewLayer *view_layer switch (ob->type) { case OB_LAMP: - ob->data = la = ID_NEW_SET(ob->data, BKE_lamp_copy(bmain, ob->data)); + ob->data = la = ID_NEW_SET(ob->data, BKE_light_copy(bmain, ob->data)); break; case OB_CAMERA: ob->data = ID_NEW_SET(ob->data, BKE_camera_copy(bmain, ob->data)); diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 6cc9a495597..88713b36094 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -868,14 +868,14 @@ static bool select_grouped_siblings(bContext *C, Object *ob) } static bool select_grouped_lamptype(bContext *C, Object *ob) { - Lamp *la = ob->data; + Light *la = ob->data; bool changed = false; CTX_DATA_BEGIN (C, Base *, base, selectable_bases) { if (base->object->type == OB_LAMP) { - Lamp *la_test = base->object->data; + Light *la_test = base->object->data; if ((la->type == la_test->type) && ((base->flag & BASE_SELECTED) == 0)) { ED_object_base_select(base, BA_SELECT); changed = true; diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 00374c12473..ee9df67a830 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -510,7 +510,7 @@ static int apply_objects_internal( } if (ob->type == OB_LAMP) { - Lamp *la = ob->data; + Light *la = ob->data; if (la->type == LA_AREA) { if (apply_rot || apply_loc) { BKE_reportf(reports, RPT_ERROR, @@ -654,7 +654,7 @@ static int apply_objects_internal( } } else if (ob->type == OB_LAMP) { - Lamp *la = ob->data; + Light *la = ob->data; if (la->type != LA_AREA) { continue; } @@ -1361,7 +1361,7 @@ static void object_transform_axis_target_calc_depth_init(struct XFormAxisData *x static bool object_is_target_compat(const Object *ob) { if (ob->type == OB_LAMP) { - const Lamp *la = ob->data; + const Light *la = ob->data; if (ELEM(la->type, LA_SUN, LA_SPOT, LA_AREA)) { return true; } -- cgit v1.2.3