diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-10-11 16:17:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-11 16:22:54 +0400 |
| commit | 54ee22130ca0ce59500c6eddb562b78eb4526bcd (patch) | |
| tree | ba21cdaa35656c590059c864e028e24b6e234082 /source/blender/bmesh/intern/bmesh_log.c | |
| parent | b09f7dcaa7b487ada53c8dbaa811deaa1201d163 (diff) | |
| parent | 04814476c08e9350c424619cd99ccb1149d65365 (diff) | |
Merge branch 'master' into dyntopo_holesdyntopo_holes
Conflicts:
source/blender/blenkernel/intern/pbvh_bmesh.c
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_log.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_log.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c index 0bb1a892ffe..709a174731f 100644 --- a/source/blender/bmesh/intern/bmesh_log.c +++ b/source/blender/bmesh/intern/bmesh_log.c @@ -423,9 +423,7 @@ static void bm_log_id_ghash_retake(RangeTreeUInt *unused_ids, GHash *id_ghash) void *key = BLI_ghashIterator_getKey(&gh_iter); unsigned int id = GET_UINT_FROM_POINTER(key); - if (range_tree_uint_has(unused_ids, id)) { - range_tree_uint_take(unused_ids, id); - } + range_tree_uint_retake(unused_ids, id); } } |