[Bf-blender-cvs] [78bbdbd9317] soc-2020-io-performance: Add emission strength to MTL importer.

[Ankit Meel]

Commit: 78bbdbd93170e7771a580ef428a167b2d34b9065
Author: Ankit Meel
Date:   Mon Sep 21 16:19:59 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB78bbdbd93170e7771a580ef428a167b2d34b9065

Add emission strength to MTL importer.

Ref rBAec4ad081e564

===================================================================

M	source/blender/io/wavefront_obj/intern/obj_import_mtl.cc

===================================================================

diff --git a/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc b/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc
index 562226e56b8..1a7d90a9774 100644
--- a/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc
@@ -314,12 +314,15 @@ void ShaderNodetreeWrap::set_bsdf_socket_values()
   float3 base_color = {std::max(0.0f, mtl_mat_.Kd[0]),
     std::max(0.0f, mtl_mat_.Kd[1]),
     std::max(0.0f, mtl_mat_.Kd[2])};
-  float3 emission = {std::max(0.0f, mtl_mat_.Ke[0]),
-    std::max(0.0f, mtl_mat_.Ke[1]),
-    std::max(0.0f, mtl_mat_.Ke[2])};
+  float3 emission_color = {std::max(0.0f, mtl_mat_.Ke[0]),
+                           std::max(0.0f, mtl_mat_.Ke[1]),
+                           std::max(0.0f, mtl_mat_.Ke[2])};
 
   set_property_of_socket(SOCK_RGBA, "Base Color", {base_color, 3}, bsdf_.get());
-  set_property_of_socket(SOCK_RGBA, "Emission", {emission, 3}, bsdf_.get());
+  set_property_of_socket(SOCK_RGBA, "Emission", {emission_color, 3}, bsdf_.get());
+  if (mtl_mat_.texture_maps.contains_as("Emission")) {
+    set_property_of_socket(SOCK_FLOAT, "Emission Strength", {1.0f}, bsdf_.get());
+  }
   set_property_of_socket(SOCK_FLOAT, "Specular", {specular}, bsdf_.get());
   set_property_of_socket(SOCK_FLOAT, "Roughness", {roughness}, bsdf_.get());
   set_property_of_socket(SOCK_FLOAT, "Metallic", {metallic}, bsdf_.get());