[Bf-blender-cvs] [8dea4b3d996] soc-2017-sculpting_improvements: Minor Bugfixes, holes in t-intersections and edge offset in smaller intersections fixed.

Sebastian Witt noreply at git.blender.org
Tue Jul 18 16:39:56 CEST 2017


Commit: 8dea4b3d9960b7ae0cf712294b055bf4ab7ed687
Author: Sebastian Witt
Date:   Tue Jul 18 16:36:37 2017 +0200
Branches: soc-2017-sculpting_improvements
https://developer.blender.org/rB8dea4b3d9960b7ae0cf712294b055bf4ab7ed687

Minor Bugfixes, holes in t-intersections and edge offset in smaller intersections fixed.

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

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 8f630e6b5ed..709103254fd 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -127,6 +127,10 @@ extern void bl_debug_draw_quad_add(const float v0[3], const float v1[3], const f
 extern void bl_debug_draw_edge_add(const float v0[3], const float v1[3]);
 extern void bl_debug_color_set(const unsigned int col);
 
+static void bl_debug_draw_medge_add(Mesh *me, int e){
+	bl_debug_draw_edge_add(me->mvert[me->medge[e].v1].co, me->mvert[me->medge[e].v2].co);
+}
+
 static void bl_debug_draw_point(const float pos[3],const float thickness)
 {
 	float h = thickness*0.5;
@@ -6212,7 +6216,7 @@ static void add_ss_tinter(SilhouetteData *sil, SpineBranch *branch, Mesh *me, fl
 		}
 	}
 
-	u_steps = 3;
+	u_steps = 5;
 	zero_v3(center);
 	for (int s = 0; s < 3; s++) {
 		copy_v3_v3(&center_s[s * 3], &sa[b_start[s]]);
@@ -6404,7 +6408,7 @@ static void add_ss_tinter(SilhouetteData *sil, SpineBranch *branch, Mesh *me, fl
 		me->mloop[me->totloop - 1].v = me->medge[e_start_center + s * (u_steps / 2) + u_steps / 2 - 1].v1;
 		me->mloop[me->totloop - 1].e = e_start_center + s * (u_steps / 2) + u_steps / 2 - 1;
 
-		me->mloop[me->totloop - 2].v = me->medge[e_t_sign[s * 2 + 1]].v2;
+		me->mloop[me->totloop - 2].v = me->medge[e_start_inner[(s + 2) % 3] - 1 + stride_le * ((u_steps / 2))].v2;
 		me->mloop[me->totloop - 2].e = e_t_sign[s * 2 + 1];
 
 		me->mloop[me->totloop - 3].v = me->medge[e_start_inner[(s + 2) % 3] - 1 + stride_le * ((u_steps / 2))].v1;




More information about the Bf-blender-cvs mailing list