style cleanup: osl and NULL pointer use, also correct sequencer gap operator id's

2013-03-27 20:27:07 +00:00
parent 535253cad0
commit d15d78a33a
8 changed files with 17 additions and 16 deletions
--- a/intern/cycles/kernel/shaders/node_normal_map.osl
+++ b/intern/cycles/kernel/shaders/node_normal_map.osl
@@ -35,9 +35,10 @@ shader node_normal_map(
 		float tangent_sign;

 		// get _unnormalized_ interpolated normal and tangent
-		if(!getattribute(attr_name, tangent) ||
+		if (!getattribute(attr_name, tangent) ||
 		   !getattribute(attr_sign_name, tangent_sign) ||
-		   !getattribute("geom:N", ninterp)) {
+		   !getattribute("geom:N", ninterp))
+		{
 			Normal = normal(0, 0, 0);
 		}
 		else {