diff options
Diffstat (limited to 'source/blender/editors/armature/reeb.c')
| -rw-r--r-- | source/blender/editors/armature/reeb.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c index b1bf13db69b..d04938fd59b 100644 --- a/source/blender/editors/armature/reeb.c +++ b/source/blender/editors/armature/reeb.c @@ -24,29 +24,14 @@ * \ingroup edarmature */ -#include <math.h> -#include <string.h> /* for memcpy */ -#include <stdio.h> -#include <stdlib.h> /* for qsort */ -#include <float.h> - -#include "DNA_scene_types.h" -#include "DNA_object_types.h" - #include "MEM_guardedalloc.h" #include "BKE_context.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_edgehash.h" #include "BLI_ghash.h" -#include "BLI_heap.h" - -#include "BKE_mesh.h" - -#include "ONL_opennl.h" #include "reeb.h" @@ -634,7 +619,7 @@ static void mergeArcBuckets(ReebArc *aDst, ReebArc *aSrc, float start, float end if (aDst->bcount > 0 && aSrc->bcount > 0) { int indexDst = 0, indexSrc = 0; - start = MAX3(start, aDst->buckets[0].val, aSrc->buckets[0].val); + start = max_fff(start, aDst->buckets[0].val, aSrc->buckets[0].val); while (indexDst < aDst->bcount && aDst->buckets[indexDst].val < start) { indexDst++; @@ -1674,7 +1659,7 @@ int filterSmartReebGraph(ReebGraph *UNUSED(rg), float UNUSED(threshold)) float avg_vec[3] = {0, 0, 0}; for (BLI_ghashIterator_init(&ghi, arc->faces); - !BLI_ghashIterator_isDone(&ghi); + BLI_ghashIterator_notDone(&ghi); BLI_ghashIterator_step(&ghi)) { EditFace *efa = BLI_ghashIterator_getValue(&ghi); @@ -2060,7 +2045,7 @@ void mergeArcFaces(ReebGraph *UNUSED(rg), ReebArc *aDst, ReebArc *aSrc) GHashIterator ghi; for (BLI_ghashIterator_init(&ghi, aSrc->faces); - !BLI_ghashIterator_isDone(&ghi); + BLI_ghashIterator_notDone(&ghi); BLI_ghashIterator_step(&ghi)) { EditFace *efa = BLI_ghashIterator_getValue(&ghi); |