From b3c1fe4b5156ddf8ff11d8d3b8cf740287353ebf Mon Sep 17 00:00:00 2001
From: Bernard Kwok <Bernard.Kwok@autodesk.com>
Date: Wed, 7 Aug 2019 19:59:48 -0400
Subject: [PATCH] Fix bad merge.

(cherry picked from commit aaf37789d493f2c594010dd4db4df733dc373ed9)
---
 libraries/pbrlib/genosl/mx_roughness_dual.osl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libraries/pbrlib/genosl/mx_roughness_dual.osl b/libraries/pbrlib/genosl/mx_roughness_dual.osl
index 98d62ee13e..6de64c73ad 100644
--- a/libraries/pbrlib/genosl/mx_roughness_dual.osl
+++ b/libraries/pbrlib/genosl/mx_roughness_dual.osl
@@ -1,9 +1,5 @@
 void mx_roughness_dual(vector2 roughness, output vector2 result)
 {
-    if (roughness.y < 0.0)
-    {
-        roughness.y = roughness.x;
-    }
     result.x = clamp(roughness.x * roughness.x, M_FLOAT_EPS, 1.0);
     if (roughness.y < 0.0)
     {