Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

BKE_global.h include path wasnt correct. made boxpack2d.c a bit more

Browse Source 
readable. no functionality changes.
This commit is contained in:
Campbell Barton
2008-08-02 21:39:01 +00:00
parent 03f9c6a3fc
commit e632b966ec
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/boolop/intern/BOP_Interface.cpp
View File

@@ -37,7 +37,7 @@
#include "BOP_Chrono.h" #include "BOP_Chrono.h"
#if defined(BOP_ORIG_MERGE) && defined(BOP_NEW_MERGE) #if defined(BOP_ORIG_MERGE) && defined(BOP_NEW_MERGE)
#include "../../source/blender/blenkernel/BKE_global.h" #include "../../../source/blender/blenkernel/BKE_global.h"
#endif #endif
BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC,

10
source/blender/blenlib/intern/boxpack2d.c
View File

@@ -42,6 +42,8 @@
#define TRF 2 #define TRF 2
#define TLF 4 #define TLF 4
#define BRF 8 #define BRF 8
#define CORNERFLAGS (BLF|TRF|TLF|BRF)
#define BL 0 #define BL 0
#define TR 1 #define TR 1
#define TL 2 #define TL 2
@@ -159,7 +161,7 @@ void boxPack2D(boxPack *boxarray, int len, float *tot_width, float *tot_height)
vert->blb = vert->brb = vert->tlb =\ vert->blb = vert->brb = vert->tlb =\
vert->isect_cache[0] = vert->isect_cache[1] =\ vert->isect_cache[0] = vert->isect_cache[1] =\
vert->isect_cache[2] = vert->isect_cache[3] = NULL; vert->isect_cache[2] = vert->isect_cache[3] = NULL;
vert->free = 15 &~ TRF; vert->free = CORNERFLAGS &~ TRF;
vert->trb = box; vert->trb = box;
vert->index = i; i++; vert->index = i; i++;
box->v[BL] = vert; vert++; box->v[BL] = vert; vert++;
@@ -167,7 +169,7 @@ void boxPack2D(boxPack *boxarray, int len, float *tot_width, float *tot_height)
vert->trb= vert->brb = vert->tlb =\ vert->trb= vert->brb = vert->tlb =\
vert->isect_cache[0] = vert->isect_cache[1] =\ vert->isect_cache[0] = vert->isect_cache[1] =\
vert->isect_cache[2] = vert->isect_cache[3] = NULL; vert->isect_cache[2] = vert->isect_cache[3] = NULL;
vert->free = 15 &~ BLF; vert->free = CORNERFLAGS &~ BLF;
vert->blb = box; vert->blb = box;
vert->index = i; i++; vert->index = i; i++;
box->v[TR] = vert; vert++; box->v[TR] = vert; vert++;
@@ -175,7 +177,7 @@ void boxPack2D(boxPack *boxarray, int len, float *tot_width, float *tot_height)
vert->trb = vert->blb = vert->tlb =\ vert->trb = vert->blb = vert->tlb =\
vert->isect_cache[0] = vert->isect_cache[1] =\ vert->isect_cache[0] = vert->isect_cache[1] =\
vert->isect_cache[2] = vert->isect_cache[3] = NULL; vert->isect_cache[2] = vert->isect_cache[3] = NULL;
vert->free = 15 &~ BRF; vert->free = CORNERFLAGS &~ BRF;
vert->brb = box; vert->brb = box;
vert->index = i; i++; vert->index = i; i++;
box->v[TL] = vert; vert++; box->v[TL] = vert; vert++;
@@ -183,7 +185,7 @@ void boxPack2D(boxPack *boxarray, int len, float *tot_width, float *tot_height)
vert->trb = vert->blb = vert->brb =\ vert->trb = vert->blb = vert->brb =\
vert->isect_cache[0] = vert->isect_cache[1] =\ vert->isect_cache[0] = vert->isect_cache[1] =\
vert->isect_cache[2] = vert->isect_cache[3] = NULL; vert->isect_cache[2] = vert->isect_cache[3] = NULL;
vert->free = 15 &~ TLF; vert->free = CORNERFLAGS &~ TLF;
vert->tlb = box; vert->tlb = box;
vert->index = i; i++; vert->index = i; i++;
box->v[BR] = vert; vert++; box->v[BR] = vert; vert++;