Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-02-27 04:02:02 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-27 04:26:49 +0300
commit1079742db92576d79ec89a28d95336aff847a82a (patch)
tree2e440e498c20d3205c2a64eedf4f84bf57abcb84 /source/blender/nodes
parent918941483f7ec5fc6320d345c755e953b963c710 (diff)
Cleanup: rename lamp -> light
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/NOD_shader.h2
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_output_lamp.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/nodes/NOD_shader.h b/source/blender/nodes/NOD_shader.h
index f6cfbffd6db..e88f7a49d30 100644
--- a/source/blender/nodes/NOD_shader.h
+++ b/source/blender/nodes/NOD_shader.h
@@ -112,7 +112,7 @@ void register_node_type_sh_uvalongstroke(void);
void register_node_type_sh_eevee_metallic(void);
void register_node_type_sh_eevee_specular(void);
-void register_node_type_sh_output_lamp(void);
+void register_node_type_sh_output_light(void);
void register_node_type_sh_output_material(void);
void register_node_type_sh_output_eevee_material(void);
void register_node_type_sh_output_world(void);
diff --git a/source/blender/nodes/shader/nodes/node_shader_output_lamp.c b/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
index efd390c872f..e9afefe5ea1 100644
--- a/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
+++ b/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
@@ -21,18 +21,18 @@
/* **************** OUTPUT ******************** */
-static bNodeSocketTemplate sh_node_output_lamp_in[] = {
+static bNodeSocketTemplate sh_node_output_light_in[] = {
{ SOCK_SHADER, 1, N_("Surface"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
{ -1, 0, "" },
};
/* node type definition */
-void register_node_type_sh_output_lamp(void)
+void register_node_type_sh_output_light(void)
{
static bNodeType ntype;
sh_node_type_base(&ntype, SH_NODE_OUTPUT_LIGHT, "Light Output", NODE_CLASS_OUTPUT, 0);
- node_type_socket_templates(&ntype, sh_node_output_lamp_in, NULL);
+ node_type_socket_templates(&ntype, sh_node_output_light_in, NULL);
node_type_init(&ntype, NULL);
node_type_storage(&ntype, "", NULL, NULL);