[Bf-blender-cvs] [f923b6faa9f] blender-v2.91-release: Fix assert in the sculpt pen tilt code
Pablo Dobarro
noreply at git.blender.org
Mon Nov 9 21:17:49 CET 2020
Commit: f923b6faa9f44ba94aee33dfc656b8341ca548c1
Author: Pablo Dobarro
Date: Mon Nov 2 23:02:02 2020 +0100
Branches: blender-v2.91-release
https://developer.blender.org/rBf923b6faa9f44ba94aee33dfc656b8341ca548c1
Fix assert in the sculpt pen tilt code
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D9422
===================================================================
M source/blender/editors/sculpt_paint/sculpt.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 875f24837c1..8c03d147768 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -2819,9 +2819,12 @@ void SCULPT_tilt_apply_to_normal(float r_normal[3], StrokeCache *cache, const fl
}
const float rot_max = M_PI_2 * tilt_strength * SCULPT_TILT_SENSITIVITY;
mul_v3_mat3_m4v3(r_normal, cache->vc->obact->obmat, r_normal);
- rotate_v3_v3v3fl(r_normal, r_normal, cache->vc->rv3d->viewinv[0], cache->y_tilt * rot_max);
- rotate_v3_v3v3fl(r_normal, r_normal, cache->vc->rv3d->viewinv[1], cache->x_tilt * rot_max);
- mul_v3_mat3_m4v3(r_normal, cache->vc->obact->imat, r_normal);
+ float normal_tilt_y[3];
+ rotate_v3_v3v3fl(normal_tilt_y, r_normal, cache->vc->rv3d->viewinv[0], cache->y_tilt * rot_max);
+ float normal_tilt_xy[3];
+ rotate_v3_v3v3fl(
+ normal_tilt_xy, normal_tilt_y, cache->vc->rv3d->viewinv[1], cache->x_tilt * rot_max);
+ mul_v3_mat3_m4v3(r_normal, cache->vc->obact->imat, normal_tilt_xy);
normalize_v3(r_normal);
}
More information about the Bf-blender-cvs
mailing list