[Bf-blender-cvs] [fbc70fa] strand_editmode: Fix for call to mirror functions when mirroring is not enabled, giving warnings.

Lukas Tönne noreply at git.blender.org
Tue May 5 14:04:41 CEST 2015


Commit: fbc70fa51c8f1ef698820a077bef6c1266596059
Author: Lukas Tönne
Date:   Tue May 5 14:03:59 2015 +0200
Branches: strand_editmode
https://developer.blender.org/rBfbc70fa51c8f1ef698820a077bef6c1266596059

Fix for call to mirror functions when mirroring is not enabled, giving
warnings.

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

M	source/blender/editors/hair/hair_mirror.c
M	source/blender/editors/hair/hair_stroke.c

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

diff --git a/source/blender/editors/hair/hair_mirror.c b/source/blender/editors/hair/hair_mirror.c
index 0e0d122..7f5b14e 100644
--- a/source/blender/editors/hair/hair_mirror.c
+++ b/source/blender/editors/hair/hair_mirror.c
@@ -150,7 +150,7 @@ BMVert *ED_strands_mirror_get(BMEditStrands *edit, BMVert *v)
 	if (mirr && *mirr >= 0 && *mirr < edit->bm->totvert) {
 		if (!edit->bm->vtable) {
 			printf("err: should only be called between "
-			       "ED_strands_mirror_cache_begin and ED_strands_mirror_cache_end");
+			       "ED_strands_mirror_cache_begin and ED_strands_mirror_cache_end\n");
 			return NULL;
 		}
 
diff --git a/source/blender/editors/hair/hair_stroke.c b/source/blender/editors/hair/hair_stroke.c
index 45fa281..76b63e8 100644
--- a/source/blender/editors/hair/hair_stroke.c
+++ b/source/blender/editors/hair/hair_stroke.c
@@ -219,13 +219,14 @@ static int hair_tool_apply_vertex(HairToolData *data, VertexToolCb cb, void *use
 	const float rad = BKE_brush_size_get(scene, brush);
 	const float radsq = rad*rad;
 	const float threshold = 0.0f; /* XXX could be useful, is it needed? */
+	const bool use_mirror = hair_use_mirror_x(data->ob);
 	
 	BMVert *v, *v_mirr;
 	BMIter iter;
 	int tot = 0;
 	float dist, factor;
 	
-	if (hair_use_mirror_x(data->ob))
+	if (use_mirror)
 		ED_strands_mirror_cache_begin(data->edit, 0, false, false, hair_use_mirror_topology(data->ob));
 	
 	BM_ITER_MESH(v, &iter, data->edit->bm, BM_VERTS_OF_MESH) {
@@ -237,14 +238,16 @@ static int hair_tool_apply_vertex(HairToolData *data, VertexToolCb cb, void *use
 			cb(data, userdata, v, factor);
 			++tot;
 			
-			v_mirr = ED_strands_mirror_get(data->edit, v);
-			if (v_mirr)
-				cb(data, userdata, v_mirr, factor);
+			if (use_mirror) {
+				v_mirr = ED_strands_mirror_get(data->edit, v);
+				if (v_mirr)
+					cb(data, userdata, v_mirr, factor);
+			}
 		}
 	}
 	
 	/* apply mirror */
-	if (hair_use_mirror_x(data->ob))
+	if (use_mirror)
 		ED_strands_mirror_cache_end(data->edit);
 	
 	return tot;




More information about the Bf-blender-cvs mailing list