diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-28 20:15:08 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-28 20:15:08 +0300 |
| commit | 871b7ba8922650c34b487fec29a9d677b1aeadfd (patch) | |
| tree | a13c8635e43919aed3ad48afe096f6501bbeb9a2 /source/blender/nodes/shader | |
| parent | 55263c8a4c03c1add138e5191f98a8b68591289f (diff) | |
| parent | 9fd0060c0f3458e53b38003d1388f16cb56f45d8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/nodes/shader')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_emission.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_emission.c b/source/blender/nodes/shader/nodes/node_shader_emission.c index 7a7c89be3a0..25194c23d0a 100644 --- a/source/blender/nodes/shader/nodes/node_shader_emission.c +++ b/source/blender/nodes/shader/nodes/node_shader_emission.c @@ -30,7 +30,7 @@ /* **************** OUTPUT ******************** */ static bNodeSocketTemplate sh_node_emission_in[] = { - { SOCK_RGBA, 1, N_("Color"), 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f}, + { SOCK_RGBA, 1, N_("Color"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f}, { SOCK_FLOAT, 1, N_("Strength"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000000.0f}, { -1, 0, "" } }; |