[Bf-blender-cvs] [0eb61ba] master: Dyntopo: possible modified option was incorrectly set
Campbell Barton
noreply at git.blender.org
Mon Jul 11 09:15:34 CEST 2016
Commit: 0eb61baeccf2fc1875f3178722177975ffdcc5e8
Author: Campbell Barton
Date: Mon Jul 11 16:03:17 2016 +1000
Branches: master
https://developer.blender.org/rB0eb61baeccf2fc1875f3178722177975ffdcc5e8
Dyntopo: possible modified option was incorrectly set
===================================================================
M source/blender/blenkernel/intern/pbvh_bmesh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index dcf3006..d7e4746 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -1839,9 +1839,8 @@ bool BKE_pbvh_bmesh_update_topology(
EdgeQueueContext eq_ctx = {&q, queue_pool, bvh->bm, cd_vert_mask_offset, cd_vert_node_offset, cd_face_node_offset};
short_edge_queue_create(&eq_ctx, bvh, center, view_normal, radius);
- modified |= !BLI_heap_is_empty(q.heap);
- pbvh_bmesh_collapse_short_edges(&eq_ctx, bvh,
- &deleted_faces);
+ modified |= pbvh_bmesh_collapse_short_edges(
+ &eq_ctx, bvh, &deleted_faces);
BLI_heap_free(q.heap, NULL);
BLI_mempool_destroy(queue_pool);
}
@@ -1852,8 +1851,8 @@ bool BKE_pbvh_bmesh_update_topology(
EdgeQueueContext eq_ctx = {&q, queue_pool, bvh->bm, cd_vert_mask_offset, cd_vert_node_offset, cd_face_node_offset};
long_edge_queue_create(&eq_ctx, bvh, center, view_normal, radius);
- modified |= !BLI_heap_is_empty(q.heap);
- pbvh_bmesh_subdivide_long_edges(&eq_ctx, bvh, &edge_loops);
+ modified |= pbvh_bmesh_subdivide_long_edges(
+ &eq_ctx, bvh, &edge_loops);
BLI_heap_free(q.heap, NULL);
BLI_mempool_destroy(queue_pool);
}
More information about the Bf-blender-cvs
mailing list