Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #35729: cycles normal maps not showing properly in preview render.

Browse Source
This commit is contained in:
Brecht Van Lommel
2013-06-13 13:55:05 +00:00
parent f173ff531c
commit f9b06060c2
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/shaders/node_normal_map.osl
View File

@@ -37,7 +37,7 @@ shader node_normal_map(
getattribute("geom:is_smooth", is_smooth);
if (!is_smooth)
ninterp = Ng;
ninterp = normalize(transform("world", "object", Ng));
// get _unnormalized_ interpolated normal and tangent
if (getattribute(attr_name, tangent) &&

9
intern/cycles/kernel/svm/svm_tex_coord.h
View File

@@ -241,10 +241,13 @@ __device void svm_node_normal_map(KernelGlobals *kg, ShaderData *sd, float *stac
float sign = primitive_attribute_float(kg, sd, attr_sign_elem, attr_sign_offset, NULL, NULL);
float3 normal;
if(sd->shader & SHADER_SMOOTH_NORMAL)
if(sd->shader & SHADER_SMOOTH_NORMAL) {
normal = primitive_attribute_float3(kg, sd, attr_normal_elem, attr_normal_offset, NULL, NULL);
else
normal = sd->N;
}
else {
normal = sd->Ng;
object_inverse_normal_transform(kg, sd, &normal);
}
/* apply normal map */
float3 B = sign * cross(normal, tangent);