[Bf-blender-cvs] [e0dd51fc147] blender-v3.2-release: Sculpt: Fix backwards normals in PBVH_GRIDS raycasting
Joseph Eagar
noreply at git.blender.org
Tue Jun 28 15:08:57 CEST 2022
Commit: e0dd51fc14763b85ddb55d32cc5858f8338c79b5
Author: Joseph Eagar
Date: Mon Jun 27 11:15:44 2022 -0700
Branches: blender-v3.2-release
https://developer.blender.org/rBe0dd51fc14763b85ddb55d32cc5858f8338c79b5
Sculpt: Fix backwards normals in PBVH_GRIDS raycasting
Winding order of grid quads was backwards.
===================================================================
M source/blender/blenkernel/intern/pbvh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 1d4fbb92fa0..640b532e417 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -2311,16 +2311,16 @@ static bool pbvh_grids_node_raycast(PBVH *pbvh,
const float *co[4];
if (origco) {
- co[0] = origco[y * gridsize + x];
- co[1] = origco[y * gridsize + x + 1];
- co[2] = origco[(y + 1) * gridsize + x + 1];
- co[3] = origco[(y + 1) * gridsize + x];
+ co[0] = origco[(y + 1) * gridsize + x];
+ co[1] = origco[(y + 1) * gridsize + x + 1];
+ co[2] = origco[y * gridsize + x + 1];
+ co[3] = origco[y * gridsize + x];
}
else {
- co[0] = CCG_grid_elem_co(gridkey, grid, x, y);
- co[1] = CCG_grid_elem_co(gridkey, grid, x + 1, y);
- co[2] = CCG_grid_elem_co(gridkey, grid, x + 1, y + 1);
- co[3] = CCG_grid_elem_co(gridkey, grid, x, y + 1);
+ co[0] = CCG_grid_elem_co(gridkey, grid, x, y + 1);
+ co[1] = CCG_grid_elem_co(gridkey, grid, x + 1, y + 1);
+ co[2] = CCG_grid_elem_co(gridkey, grid, x + 1, y);
+ co[3] = CCG_grid_elem_co(gridkey, grid, x, y);
}
if (ray_face_intersection_quad(
More information about the Bf-blender-cvs
mailing list