Merge branch 'master' into xr-devxr-dev

1 files changed, 6 insertions, 1 deletions

diff --git a/source/blender/draw/engines/eevee/shaders/surface_frag.glsl b/source/blender/draw/engines/eevee/shaders/surface_frag.glsl
index ace6c7d788d..88755705a53 100644
--- a/source/blender/draw/engines/eevee/shaders/surface_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/surface_frag.glsl
@@ -152,7 +152,8 @@ void main()
 /* Only supported attrib for world/background shaders. */
 vec3 attr_load_orco(vec4 orco)
 {
-  return g_data.P;
+  /* Retain precision better than g_data.P (see T99128). */
+  return -normal_view_to_world(viewCameraVec(viewPosition));
 }
 /* Unsupported. */
 vec4 attr_load_tangent(vec4 tangent)
@@ -181,3 +182,7 @@ vec4 attr_load_color_post(vec4 attr)
 {
   return attr;
 }
+vec4 attr_load_uniform(vec4 attr, const uint attr_hash)
+{
+  return attr;
+}