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/space_node/node_draw.c | 2 +- source/blender/editors/space_node/node_edit.c | 2 +- source/blender/editors/space_node/space_node.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/space_node') diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index ed1db0e6fae..ffc9ba54c99 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -102,7 +102,7 @@ static bNodeTree *node_tree_from_ID(ID *id) case ID_MA: return ((Material *)id)->nodetree; case ID_LA: - return ((Lamp *)id)->nodetree; + return ((Light *)id)->nodetree; case ID_WO: return ((World *)id)->nodetree; case ID_SCE: diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 91fc344ec01..6347548cd7e 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -413,7 +413,7 @@ void ED_node_shader_default(const bContext *C, ID *id) } case ID_LA: { - Lamp *la = (Lamp *)id; + Light *la = (Light *)id; la->nodetree = ntree; output_type = SH_NODE_OUTPUT_LIGHT; diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 0039fb1e2ab..b94a27b7839 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -531,7 +531,7 @@ static void node_area_refresh(const struct bContext *C, ScrArea *sa) ED_preview_shader_job(C, sa, snode->id, NULL, NULL, 100, 100, PR_NODE_RENDER); } else if (GS(snode->id->name) == ID_LA) { - Lamp *la = (Lamp *)snode->id; + Light *la = (Light *)snode->id; if (la->use_nodes) ED_preview_shader_job(C, sa, snode->id, NULL, NULL, 100, 100, PR_NODE_RENDER); } -- cgit v1.2.3