[Bf-blender-cvs] [07cffae] strand_editmode strand_gpu: Fix for uninitialized v_mirr variable when using edge strokes with mirroring.
Lukas Tönne
noreply at git.blender.org
Wed Jul 20 09:45:32 CEST 2016
Commit: 07cffae7eafc6d55857348075aea5dfc3c191db7
Author: Lukas Tönne
Date: Wed Jul 20 09:44:39 2016 +0200
Branches: strand_editmode strand_gpu
https://developer.blender.org/rB07cffae7eafc6d55857348075aea5dfc3c191db7
Fix for uninitialized v_mirr variable when using edge strokes with mirroring.
===================================================================
M source/blender/editors/hair/hair_stroke.c
===================================================================
diff --git a/source/blender/editors/hair/hair_stroke.c b/source/blender/editors/hair/hair_stroke.c
index c73e084..935f5d9 100644
--- a/source/blender/editors/hair/hair_stroke.c
+++ b/source/blender/editors/hair/hair_stroke.c
@@ -267,12 +267,15 @@ static int hair_tool_apply_strand_edges(HairToolData *data, EdgeToolCb cb, void
const float threshold = 0.0f; /* XXX could be useful, is it needed? */
const bool use_mirror = hair_use_mirror_x(data->ob);
- BMVert *v, *vprev, *v_mirr, *vprev_mirr;
+ BMVert *v, *v_mirr, *vprev, *vprev_mirr;
BMIter iter;
int k;
int tot = 0;
BM_ITER_STRANDS_ELEM_INDEX(v, &iter, root, BM_VERTS_OF_STRAND, k) {
+ if (use_mirror)
+ v_mirr = ED_strands_mirror_get(data->edit, v);
+
if (k > 0) {
float dist, lambda;
@@ -283,7 +286,6 @@ static int hair_tool_apply_strand_edges(HairToolData *data, EdgeToolCb cb, void
++tot;
if (use_mirror) {
- v_mirr = ED_strands_mirror_get(data->edit, v);
if (vprev_mirr && v_mirr)
cb(data, userdata, vprev_mirr, v_mirr, factor, lambda);
}
More information about the Bf-blender-cvs
mailing list