[Bf-blender-cvs] [7c44a9e] soc-2016-pbvh-painting: Got the mirror button working. Got multipaint working again.
Nathan Vollmer
noreply at git.blender.org
Fri Jul 15 04:26:53 CEST 2016
Commit: 7c44a9e1c4992c16437a70931a22a0a51a7bd300
Author: Nathan Vollmer
Date: Thu Jul 14 14:07:01 2016 -0600
Branches: soc-2016-pbvh-painting
https://developer.blender.org/rB7c44a9e1c4992c16437a70931a22a0a51a7bd300
Got the mirror button working. Got multipaint working again.
===================================================================
M source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 69d6e89..12ac8a1 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -2378,21 +2378,7 @@ static void do_wpaint_brush_draw_task_cb_ex(
if (sculpt_brush_test(&test, vd.co)) {
const float fade = BKE_brush_curve_strength(brush, test.dist, cache->radius);
int vertexIndex = vd.vert_indices[vd.i];
-
- MDeformWeight *dw, *dw_prev;
- MDeformVert *dv = &data->me->dvert[vertexIndex];
- dw = defvert_verify_index(dv, data->wpi->active.index);
- dw_prev = defvert_verify_index(data->vp->wpaint_prev + vertexIndex, data->wpi->active.index);
- dw->weight = wpaint_blend(data->vp, dw->weight, dw_prev->weight, fade, paintweight, data->wpi->brush_alpha_value, data->wpi->do_flip);
- //do_weight_paint_vertex(data->vp, data->ob, &data->wpi, vertexIndex, 255.0, paintweight);
-
- //if a vertex is within the brush region, then paint each loop that vertex owns.
- //for (int j = 0; j < ss->vert_to_loop[vertexIndex].count; ++j) {
- // int loopIndex = ss->vert_to_loop[vertexIndex].indices[j];
- // //Mix the new color with the original based on the brush strength and the curve.
- //
- // //lcol[loopIndex] = vpaint_blend(data->vp, lcol[loopIndex], lcolorig[loopIndex], data->vpd->paintcol, 255.0 * fade * bstrength, 255.0);
- //}
+ do_weight_paint_vertex(data->vp, data->ob, data->wpi, vertexIndex, fade, paintweight);
}
BKE_pbvh_vertex_iter_end;
}
More information about the Bf-blender-cvs
mailing list