diff options
Diffstat (limited to 'source/blender/blenlib/intern/scanfill.c')
| -rw-r--r-- | source/blender/blenlib/intern/scanfill.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c index e430f78a100..d1150748dff 100644 --- a/source/blender/blenlib/intern/scanfill.c +++ b/source/blender/blenlib/intern/scanfill.c @@ -35,21 +35,13 @@ #include "MEM_guardedalloc.h" -#include "DNA_listBase.h" -#include "DNA_mesh_types.h" #include "BLI_editVert.h" #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_scanfill.h" -#include "BLI_callbacks.h" #include "BKE_utildefines.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - /* callbacks for errors and interrupts and some goo */ static void (*BLI_localErrorCallBack)(char*) = NULL; static int (*BLI_localInterruptCallBack)(void) = NULL; @@ -187,7 +179,7 @@ static void *new_mem_element(int size) if(cur) { if(size+offs < blocksize) { adr= (void *) (cur->data+offs); - offs+= size; + offs+= size; return adr; } } @@ -306,7 +298,7 @@ static short testedgeside(float *v1, float *v2, float *v3) float inp; inp= (v2[cox]-v1[cox])*(v1[coy]-v3[coy]) - +(v1[coy]-v2[coy])*(v1[cox]-v3[cox]); + +(v1[coy]-v2[coy])*(v1[cox]-v3[cox]); if(inp<0.0) return 0; else if(inp==0) { @@ -383,7 +375,7 @@ static ScFillVert *addedgetoscanlist(EditEdge *eed, int len) /* find location in list */ scsearch.v1= eed->v1; sc= (ScFillVert *)bsearch(&scsearch,scdata,len, - sizeof(ScFillVert), vergscdata); + sizeof(ScFillVert), vergscdata); if(sc==0) printf("Error in search edge: %p\n",eed); else if(addedgetoscanvert(sc,eed)==0) return sc; |