kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bugfix #5548

Browse Source 
New option to use "Tangent Space normalmap" normals now works for node
materials.
This commit is contained in:
Ton Roosendaal 2007-01-08 20:53:43 +00:00
parent 97eb805f9c
commit fb17663988
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/render/intern/source/convertblender.c
View File

@ -473,7 +473,7 @@ static void calc_tangent_vector(Render *re, VlakRen *vlr)
tangv[1] = (s1*e2[1] - s2*e1[1])*det;
tangv[2] = (s1*e2[2] - s2*e1[2])*det;
Crossf(ct, tang, tangv);
/* qdn: check flip */
/* check flip */
if ((ct[0]*vlr->n[0] + ct[1]*vlr->n[1] + ct[2]*vlr->n[2]) < 0.f)
VecMulf(tang, -1.f);
@ -591,7 +591,7 @@ static void calc_vertexnormals(Render *re, int startvert, int startvlak, int do_
}
if(do_tangent) {
/* qdn: tangents still need to be calculated for flat faces too */
/* tangents still need to be calculated for flat faces too */
/* weighting removed, they are not vertexnormals */
calc_tangent_vector(re, vlr);
}
@ -621,7 +621,7 @@ static void calc_vertexnormals(Render *re, int startvert, int startvlak, int do_
if(do_tangent) {
float *tav= RE_vertren_get_tangent(re, ver, 0);
if (tav) {
/* qdn: orthonorm. */
/* orthonorm. */
float tdn = tav[0]*ver->n[0] + tav[1]*ver->n[1] + tav[2]*ver->n[2];
tav[0] -= ver->n[0]*tdn;
tav[1] -= ver->n[1]*tdn;
@ -706,7 +706,7 @@ static void calc_fluidsimnormals(Render *re, int startvert, int startvlak, int d
// calc_tangent_vector(re, vlr, fac1, fac2, fac3, fac4);
}
if(do_tangent) {
/* qdn: tangents still need to be calculated for flat faces too */
/* tangents still need to be calculated for flat faces too */
/* weighting removed, they are not vertexnormals */
calc_tangent_vector(re, vlr);
}
@ -1811,8 +1811,8 @@ static void init_render_mesh(Render *re, Object *ob, Object *par, int only_verts
need_orco= 1;
if(ma->texco & TEXCO_STRESS)
need_stress= 1;
/* qdn: normalmaps, test if tangents needed, separated from shading */
if ((ma->mode & MA_TANGENT_V) || (ma->mode & MA_NORMAP_TANG)) {
/* normalmaps, test if tangents needed, separated from shading */
if ((ma->mode_l & MA_TANGENT_V) || (ma->mode_l & MA_NORMAP_TANG)) {
need_tangent= 1;
if(me->mtface==NULL)
need_orco= 1;

2
source/blender/src/drawnode.c
View File

@ -1366,7 +1366,7 @@ static int node_composit_buts_channel_matte(uiBlock *block, bNodeTree *ntree, bN
else if(node->custom1==3){
c1="Y"; c2="U"; c3="V";
}
else if(node->custom1==4){
else { // if(node->custom1==4){
c1="Y"; c2="Cb"; c3="Cr";
}