[Bf-blender-cvs] [f9787ea484c] soc-2019-cycles-procedural: Clean up map range node

[OmarSquircleArt]

Commit: f9787ea484c2b210647588bc3d3520297a178f48
Author: OmarSquircleArt
Date:   Thu Jun 6 12:54:46 2019 +0200
Branches: soc-2019-cycles-procedural
https://developer.blender.org/rBf9787ea484c2b210647588bc3d3520297a178f48

Clean up map range node

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

M	intern/cycles/kernel/shaders/node_map_range.osl
M	intern/cycles/kernel/svm/svm_map_range.h
M	intern/cycles/render/nodes.cpp
M	intern/cycles/render/nodes.h
M	source/blender/gpu/shaders/gpu_shader_material.glsl
M	source/blender/nodes/shader/nodes/node_shader_mapRange.c

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

diff --git a/intern/cycles/kernel/shaders/node_map_range.osl b/intern/cycles/kernel/shaders/node_map_range.osl
index 346247644b0..eba2e7fcaf3 100644
--- a/intern/cycles/kernel/shaders/node_map_range.osl
+++ b/intern/cycles/kernel/shaders/node_map_range.osl
@@ -19,7 +19,7 @@
 shader node_map_range(float ValueIn = 0.0, float FromMin = 0.0, float FromMax = 1.0,
                       float ToMin = 0.0, float ToMax = 1.0, output float ValueOut = 0.0)
 {
-  if (FromMax != FromMin && ToMax != ToMin) {
+  if (FromMax != FromMin) {
     ValueOut = ToMin + ((ValueIn - FromMin) / (FromMax - FromMin)) * (ToMax - ToMin);
   }
   else {
diff --git a/intern/cycles/kernel/svm/svm_map_range.h b/intern/cycles/kernel/svm/svm_map_range.h
index 53fbf1f10a0..c3e02fd53be 100644
--- a/intern/cycles/kernel/svm/svm_map_range.h
+++ b/intern/cycles/kernel/svm/svm_map_range.h
@@ -35,7 +35,7 @@ ccl_device void svm_node_map_range(KernelGlobals *kg,
   float toMax = stack_load_float(stack, node1.z);
 
   float r;
-  if (fromMax != fromMin && toMax != toMin) {
+  if (fromMax != fromMin) {
     r = toMin + ((value - fromMin) / (fromMax - fromMin)) * (toMax - toMin);
   }
   else {
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index b36a771141b..f972f3cfc14 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -5286,19 +5286,19 @@ void OutputNode::compile(OSLCompiler &compiler)
     compiler.add(this, "node_output_displacement");
 }
 
-/* Blackbody */
+/* Map Range Node */
 
 NODE_DEFINE(MapRangeNode)
 {
   NodeType *type = NodeType::add("map_range", create, NodeType::SHADER);
 
-  SOCKET_IN_FLOAT(value_in, "Value", 0.0f);
+  SOCKET_IN_FLOAT(valueIn, "Value", 0.0f);
   SOCKET_IN_FLOAT(fromMin, "From Min", 0.0f);
   SOCKET_IN_FLOAT(fromMax, "From Max", 1.0f);
   SOCKET_IN_FLOAT(toMin, "To Min", 0.0f);
   SOCKET_IN_FLOAT(toMax, "To Max", 1.0f);
 
-  SOCKET_OUT_FLOAT(value_out, "Value");
+  SOCKET_OUT_FLOAT(valueOut, "Value");
 
   return type;
 }
@@ -5311,8 +5311,8 @@ void MapRangeNode::constant_fold(const ConstantFolder &folder)
 {
   if (folder.all_inputs_constant()) {
     float r;
-    if (fromMax != fromMin && toMax != toMin) {
-      r = toMin + ((value_in - fromMin) / (fromMax - fromMin)) * (toMax - toMin);
+    if (fromMax != fromMin) {
+      r = toMin + ((valueIn - fromMin) / (fromMax - fromMin)) * (toMax - toMin);
     }
     else {
       r = 0.0f;
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index f02d4aef342..2f4c43c9193 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -1237,7 +1237,7 @@ class MapRangeNode : public ShaderNode {
   {
     return NODE_GROUP_LEVEL_3;
   }
-  float value_in, fromMin, fromMax, toMin, toMax;
+  float valueIn, fromMin, fromMax, toMin, toMax;
 };
 
 class MathNode : public ShaderNode {
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 14ebc81ae0b..e320333a0b4 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -488,7 +488,7 @@ void squeeze(float val, float width, float center, out float outval)
 void map_range(
     float value, float fromMin, float fromMax, float toMin, float toMax, out float outval)
 {
-  if (fromMax != fromMin && toMax != toMin) {
+  if (fromMax != fromMin) {
     outval = toMin + ((value - fromMin) / (fromMax - fromMin)) * (toMax - toMin);
   }
   else {
diff --git a/source/blender/nodes/shader/nodes/node_shader_mapRange.c b/source/blender/nodes/shader/nodes/node_shader_mapRange.c
index 39d7f49da0f..c3cb593bb3e 100644
--- a/source/blender/nodes/shader/nodes/node_shader_mapRange.c
+++ b/source/blender/nodes/shader/nodes/node_shader_mapRange.c
@@ -52,7 +52,7 @@ static void node_shader_exec_map_range(void *UNUSED(data),
   nodestack_get_vec(&toMin, SOCK_FLOAT, in[3]);
   nodestack_get_vec(&toMax, SOCK_FLOAT, in[4]);
 
-  if (fromMax != fromMin && toMax != toMin) {
+  if (fromMax != fromMin) {
     out[0]->vec[0] = toMin + ((value - fromMin) / (fromMax - fromMin)) * (toMax - toMin);
   }
   else {