From 42dd888b98b598c240f78302b857fa60add08ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Thu, 28 Mar 2019 22:08:39 +0100 Subject: Fix T62178 Eevee: Texture Box mapping not matching Cycles if object is scaled The wrong transformation was used. Add a new matrix specially for this case. This also fix the Node texture coordinate that was suffering the same issue. --- source/blender/draw/intern/draw_manager.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'source/blender/draw/intern/draw_manager.h') diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h index 25dbe776858..45721951abf 100644 --- a/source/blender/draw/intern/draw_manager.h +++ b/source/blender/draw/intern/draw_manager.h @@ -99,10 +99,11 @@ enum { DRW_CALL_MODELVIEWINVERSE = (1 << 2), DRW_CALL_MODELVIEWPROJECTION = (1 << 3), DRW_CALL_NORMALVIEW = (1 << 4), - DRW_CALL_NORMALWORLD = (1 << 5), - DRW_CALL_ORCOTEXFAC = (1 << 6), - DRW_CALL_EYEVEC = (1 << 7), - DRW_CALL_OBJECTINFO = (1 << 8), + DRW_CALL_NORMALVIEWINVERSE = (1 << 5), + DRW_CALL_NORMALWORLD = (1 << 6), + DRW_CALL_ORCOTEXFAC = (1 << 7), + DRW_CALL_EYEVEC = (1 << 8), + DRW_CALL_OBJECTINFO = (1 << 9), }; typedef struct DRWCallState { @@ -122,6 +123,7 @@ typedef struct DRWCallState { float modelviewinverse[4][4]; float modelviewprojection[4][4]; float normalview[3][3]; + float normalviewinverse[3][3]; float normalworld[3][3]; /* Not view dependent */ float orcotexfac[2][3]; /* Not view dependent */ float objectinfo[2]; @@ -258,6 +260,7 @@ struct DRWShadingGroup { int modelviewinverse; int modelviewprojection; int normalview; + int normalviewinverse; int normalworld; int orcotexfac; int eye; -- cgit v1.2.3