[Bf-blender-cvs] [d48a9528ca2] master: Fix missing return error introduced by last commit

[Luca Rood]

Commit: d48a9528ca2a2cc9b5fa0d1d221c3efe1491d078
Author: Luca Rood
Date:   Mon Jul 3 12:12:27 2017 +0200
Branches: master
https://developer.blender.org/rBd48a9528ca2a2cc9b5fa0d1d221c3efe1491d078

Fix missing return error introduced by last commit

End of non-void function was being reached since
f5535fcb83fd7c1374697923b43565c9e303d225

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

M	intern/cycles/render/constant_fold.cpp

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

diff --git a/intern/cycles/render/constant_fold.cpp b/intern/cycles/render/constant_fold.cpp
index 9db875ea4f1..943b218f0e4 100644
--- a/intern/cycles/render/constant_fold.cpp
+++ b/intern/cycles/render/constant_fold.cpp
@@ -167,8 +167,9 @@ bool ConstantFolder::try_bypass_or_make_constant(ShaderInput *input, bool clamp)
 				graph->disconnect(other);
 			}
 		}
-		return false;
 	}
+
+	return false;
 }
 
 bool ConstantFolder::is_zero(ShaderInput *input) const