Merge pull request #2637 from sebavan/master

Fix PBR Bump Scale

src/Shaders/ShadersInclude/bumpFragment.fx

@@ -2,7 +2,6 @@
 
 #if defined(BUMP) || defined(PARALLAX)
 	#ifdef NORMALXYSCALE
-		normalW = normalize(normalW * vec3(vBumpInfos.y, vBumpInfos.y, 1.0));
 		float normalScale = 1.0;
 	#else		
 		float normalScale = vBumpInfos.y;

src/Shaders/ShadersInclude/bumpFragmentFunctions.fx

@@ -41,11 +41,15 @@
 	vec3 perturbNormal(mat3 cotangentFrame, vec2 uv)
 	{
 		vec3 map = texture2D(bumpSampler, uv).xyz;
-
 		map.x = vNormalReoderParams.x + vNormalReoderParams.y * map.x;
 		map.y = vNormalReoderParams.z + vNormalReoderParams.w * map.y;
 
 		map = map * 255. / 127. - 128. / 127.;
+
+		#ifdef NORMALXYSCALE
+			map = normalize(map * vec3(vBumpInfos.y, vBumpInfos.y, 1.0));
+		#endif
+
 		return normalize(cotangentFrame * map);
 	}