Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-08-24 20:43:09 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-08-24 20:43:09 +0400
commit1e2ceabbe1138cc331afe14b1f0916aa12bb1ea1 (patch)
tree00085d41c03c64ffbb7378991be0cd84ddcc2f54 /source/blender/bmesh/intern/bmesh_walkers_impl.c
parent585272fbcf2a23d7491b229736d8de6234ab290b (diff)
correct error in face walker (was inserting into the wrong ghash which was immediately freed after)
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_walkers_impl.c')
-rw-r--r--source/blender/bmesh/intern/bmesh_walkers_impl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c
index 6a8ce32991e..2baa78856f4 100644
--- a/source/blender/bmesh/intern/bmesh_walkers_impl.c
+++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c
@@ -694,7 +694,7 @@ static bool bmw_FaceLoopWalker_include_face(BMWalker *walker, BMLoop *l)
return false;
}
- /* the face must not have been already visite */
+ /* the face must not have been already visited */
if (BLI_ghash_haskey(walker->visithash, l->f) && BLI_ghash_haskey(walker->secvisithash, l->e)) {
return false;
}
@@ -741,7 +741,7 @@ static void bmw_FaceLoopWalker_begin(BMWalker *walker, void *data)
lwalk->no_calc = false;
BLI_ghash_insert(walker->visithash, lwalk->l->f, NULL);
- /* rewin */
+ /* rewind */
while ((owalk_pt = BMW_current_state(walker))) {
owalk = *((BMwFaceLoopWalker *)owalk_pt);
BMW_walk(walker);
@@ -753,7 +753,7 @@ static void bmw_FaceLoopWalker_begin(BMWalker *walker, void *data)
BLI_ghash_free(walker->secvisithash, NULL, NULL);
walker->secvisithash = BLI_ghash_ptr_new("bmesh walkers 3");
- BLI_ghash_insert(walker->visithash, lwalk->l->e, NULL);
+ BLI_ghash_insert(walker->secvisithash, lwalk->l->e, NULL);
BLI_ghash_free(walker->visithash, NULL, NULL);
walker->visithash = BLI_ghash_ptr_new("bmesh walkers 3");