From b248ec97769fa654a3ee8bb2a643046b79e7c030 Mon Sep 17 00:00:00 2001
From: Alex Strand <astrand130>
Date: Wed, 9 Sep 2020 11:36:57 +0200
Subject: Shaders: add emission strength input to Principled BSDF node

This impacts I/O add-ons. OBJ, FBX and Collada have been updated, glTF not yet.

Differential Revision: https://developer.blender.org/D4971
---
 .../nodes/shader/nodes/node_shader_bsdf_principled.c    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'source/blender/nodes')

diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c
index b9784e44053..ccc5198832a 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c
@@ -49,6 +49,7 @@ static bNodeSocketTemplate sh_node_bsdf_principled_in[] = {
     {SOCK_FLOAT, N_("Transmission"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
     {SOCK_FLOAT, N_("Transmission Roughness"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
     {SOCK_RGBA, N_("Emission"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+    {SOCK_FLOAT, N_("Emission Strength"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000000.0f},
     {SOCK_FLOAT, N_("Alpha"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
     {SOCK_VECTOR, N_("Normal"), 0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE, SOCK_HIDE_VALUE},
     {SOCK_VECTOR,
@@ -89,26 +90,26 @@ static int node_shader_gpu_bsdf_principled(GPUMaterial *mat,
   GPUNodeLink *sss_scale;
 
   /* Normals */
-  if (!in[19].link) {
-    GPU_link(mat, "world_normals_get", &in[19].link);
+  if (!in[20].link) {
+    GPU_link(mat, "world_normals_get", &in[20].link);
   }
 
   /* Clearcoat Normals */
-  if (!in[20].link) {
-    GPU_link(mat, "world_normals_get", &in[20].link);
+  if (!in[21].link) {
+    GPU_link(mat, "world_normals_get", &in[21].link);
   }
 
 #if 0 /* Not used at the moment. */
   /* Tangents */
-  if (!in[21].link) {
+  if (!in[22].link) {
     GPUNodeLink *orco = GPU_attribute(CD_ORCO, "");
-    GPU_link(mat, "tangent_orco_z", orco, &in[21].link);
+    GPU_link(mat, "tangent_orco_z", orco, &in[22].link);
     GPU_link(mat,
              "node_tangent",
              GPU_builtin(GPU_WORLD_NORMAL),
-             in[21].link,
+             in[22].link,
              GPU_builtin(GPU_OBJECT_MATRIX),
-             &in[21].link);
+             &in[22].link);
   }
 #endif
 
-- 
cgit v1.2.3