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/editors/space_outliner | |
| parent | 918941483f7ec5fc6320d345c755e953b963c710 (diff) | |
Cleanup: rename lamp -> light
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_edit.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/space_outliner.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 2bdae3fecb2..3742a1ad912 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -476,8 +476,8 @@ static int outliner_id_remap_exec(bContext *C, wmOperator *op) /* recreate dependency graph to include new objects */ DEG_relations_tag_update(bmain); - /* free gpu materials, some materials depend on existing objects, - * such as lamps so freeing correctly refreshes */ + /* Free gpu materials, some materials depend on existing objects, + * such as lights so freeing correctly refreshes. */ GPU_materials_free(bmain); WM_event_add_notifier(C, NC_WINDOW, NULL); diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 2daa49b1381..131701e8bcb 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -430,7 +430,7 @@ static eOLDrawState tree_element_active_material( return OL_DRAWSEL_NONE; } -static eOLDrawState tree_element_active_lamp( +static eOLDrawState tree_element_active_light( bContext *UNUSED(C), Scene *UNUSED(scene), ViewLayer *view_layer, SpaceOutliner *soops, TreeElement *te, const eOLSetState set) { @@ -928,7 +928,7 @@ eOLDrawState tree_element_active(bContext *C, Scene *scene, ViewLayer *view_laye case ID_WO: return tree_element_active_world(C, scene, view_layer, soops, te, set); case ID_LA: - return tree_element_active_lamp(C, scene, view_layer, soops, te, set); + return tree_element_active_light(C, scene, view_layer, soops, te, set); case ID_TXT: return tree_element_active_text(C, scene, view_layer, soops, te, set); case ID_CA: diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c index f38613ffade..3d79a15a5a0 100644 --- a/source/blender/editors/space_outliner/space_outliner.c +++ b/source/blender/editors/space_outliner/space_outliner.c @@ -171,7 +171,7 @@ static void outliner_main_region_listener( ED_region_tag_redraw(ar); break; case NC_LAMP: - /* For updating lamp icons, when changing lamp type */ + /* For updating light icons, when changing light type */ if (wmn->data == ND_LIGHTING_DRAW) ED_region_tag_redraw(ar); break; |