Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjon denning <gfxcoder@gmail.com>2022-07-29 20:51:49 +0300
committerjon denning <gfxcoder@gmail.com>2022-07-29 20:51:49 +0300
commit6485941d7a8158381288ce044b657e2c147ff73a (patch)
tree8fc98916154dfc7d7f57a95732fddb620272d9ac /intern/cycles/kernel/integrator/init_from_bake.h
parenteee25a175ad3c0736878918bacd4995e67195ec0 (diff)
parent9b9417b66150fd070619006dbd233369709edf1b (diff)
Merge branch 'master' into retopo_transformretopo_transform
Diffstat (limited to 'intern/cycles/kernel/integrator/init_from_bake.h')
-rw-r--r--intern/cycles/kernel/integrator/init_from_bake.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/kernel/integrator/init_from_bake.h b/intern/cycles/kernel/integrator/init_from_bake.h
index bf3f41b52b9..dd26215bcd2 100644
--- a/intern/cycles/kernel/integrator/init_from_bake.h
+++ b/intern/cycles/kernel/integrator/init_from_bake.h
@@ -155,6 +155,11 @@ ccl_device bool integrator_init_from_bake(KernelGlobals kg,
1.0f - u);
}
+ /* Convert from Blender to Cycles/Embree/OptiX barycentric convention. */
+ const float tmp = u;
+ u = v;
+ v = 1.0f - tmp - v;
+
/* Position and normal on triangle. */
const int object = kernel_data.bake.object_index;
float3 P, Ng;