archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Revert "Fix T62621 object scale changes tangent node output in Eevee"

Browse Source 
This reverts commit 86646dab7c.
This commit is contained in:
Clément Foucault
2019-03-21 23:30:24 +01:00
parent 1f1e90a013
commit cc1b193ddf
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl
View File

@@ -66,8 +66,8 @@ void main()
gl_Position = ModelViewProjectionMatrix * vec4(pos, 1.0);
viewPosition = (ModelViewMatrix * vec4(pos, 1.0)).xyz;
worldPosition = (ModelMatrix * vec4(pos, 1.0)).xyz;
worldNormal = WorldNormalMatrix * nor;
viewNormal = NormalMatrix * nor;
worldNormal = normalize(WorldNormalMatrix * nor);
viewNormal = normalize(NormalMatrix * nor);
#endif
/* Used for planar reflections */

4
source/blender/draw/engines/eevee/shaders/shadow_vert.glsl
View File

@@ -24,8 +24,8 @@ void main() {
#ifdef MESH_SHADER
viewPosition = (ModelViewMatrix * vec4(pos, 1.0)).xyz;
worldPosition = (ModelMatrix * vec4(pos, 1.0)).xyz;
viewNormal = NormalMatrix * nor;
worldNormal = WorldNormalMatrix * nor;
viewNormal = normalize(NormalMatrix * nor);
worldNormal = normalize(WorldNormalMatrix * nor);
#ifdef USE_ATTR
pass_attr(pos);
#endif

2
source/blender/draw/intern/draw_manager_exec.c
View File

@@ -803,7 +803,6 @@ static void draw_matrices_model_prepare(DRWCallState *st)
copy_m3_m4(st->normalview, st->modelview);
invert_m3(st->normalview);
transpose_m3(st->normalview);
normalize_m3(st->normalview);
}
if (st->matflag & DRW_CALL_EYEVEC) {
/* Used by orthographic wires */
@@ -822,7 +821,6 @@ static void draw_matrices_model_prepare(DRWCallState *st)
copy_m3_m4(st->normalworld, st->model);
invert_m3(st->normalworld);
transpose_m3(st->normalworld);
normalize_m3(st->normalworld);
st->matflag &= ~DRW_CALL_NORMALWORLD;
}
}