[Bf-blender-cvs] [0294e1d27f2] master: Fix T62236: Crash texture painting

Campbell Barton noreply at git.blender.org
Wed Mar 6 06:54:26 CET 2019


Commit: 0294e1d27f2f64e88ab980f5fafa3d3e0743877c
Author: Campbell Barton
Date:   Wed Mar 6 16:47:02 2019 +1100
Branches: master
https://developer.blender.org/rB0294e1d27f2f64e88ab980f5fafa3d3e0743877c

Fix T62236: Crash texture painting

Caused by 10d9a2494fc5e which removed 5x length clamping.

===================================================================

M	source/blender/editors/sculpt_paint/paint_image_proj.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 1b5f0cae40c..6da33ad8b72 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -1322,6 +1322,9 @@ static void uv_image_outset(
 			len_fact = cosf(tri_ang);
 			len_fact = UNLIKELY(len_fact < FLT_EPSILON) ? FLT_MAX : (1.0f / len_fact);
 
+			/* Clamp the length factor, see: T62236. */
+			len_fact = MIN2(len_fact, 5.0f);
+
 			mul_v2_fl(no, ps->seam_bleed_px * len_fact);
 
 			add_v2_v2v2(seam_data->seam_puvs[i], puv[fidx[i]], no);



More information about the Bf-blender-cvs mailing list