kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

replace references to old arithb library

Browse Source
This commit is contained in:
Campbell Barton 2011-03-02 05:05:12 +00:00
parent e2304a4dbb
commit 3c3997f050
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenlib/BLI_blenlib.h
View File

@ -50,10 +50,6 @@
* platform dependencies. (There are other platform-dependent * platform dependencies. (There are other platform-dependent
* fixes as well.) * fixes as well.)
* - The file i/o has some redundant code. It should be cleaned. * - The file i/o has some redundant code. It should be cleaned.
* - arithb.c is a very messy matrix library. We need a better
* solution.
* - vectorops.c is close to superfluous. It may disappear in the
* near future.
* *
* \subsection dependencies Dependencies * \subsection dependencies Dependencies
* *

2
source/blender/blenlib/BLI_winstuff.h
View File

@ -75,7 +75,7 @@
#undef small #undef small
// These definitions are also in arithb for simplicity // These definitions are also in BLI_math for simplicity
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
source/blender/editors/include/ED_view3d.h
View File

@ -155,7 +155,7 @@ void view3d_region_operator_needs_opengl(struct wmWindow *win, struct ARegion *a
void view3d_get_view_aligned_coordinate(struct ViewContext *vc, float *fp, short mval[2]); void view3d_get_view_aligned_coordinate(struct ViewContext *vc, float *fp, short mval[2]);
void view3d_get_transformation(struct ARegion *ar, struct RegionView3D *rv3d, struct Object *ob, struct bglMats *mats); void view3d_get_transformation(struct ARegion *ar, struct RegionView3D *rv3d, struct Object *ob, struct bglMats *mats);
/* XXX should move to arithb.c */ /* XXX should move to BLI_math */
int edge_inside_circle(short centx, short centy, short rad, short x1, short y1, short x2, short y2); int edge_inside_circle(short centx, short centy, short rad, short x1, short y1, short x2, short y2);
int lasso_inside(short mcords[][2], short moves, short sx, short sy); int lasso_inside(short mcords[][2], short moves, short sx, short sy);
int lasso_inside_edge(short mcords[][2], short moves, int x0, int y0, int x1, int y1); int lasso_inside_edge(short mcords[][2], short moves, int x0, int y0, int x1, int y1);

4
source/blender/editors/sculpt_paint/paint_image.c
View File

@ -785,7 +785,7 @@ static int project_bucket_point_occluded(const ProjPaintState *ps, LinkNode *buc
return 0; return 0;
} }
/* basic line intersection, could move to arithb.c, 2 points with a horiz line /* basic line intersection, could move to math_geom.c, 2 points with a horiz line
* 1 for an intersection, 2 if the first point is aligned, 3 if the second point is aligned */ * 1 for an intersection, 2 if the first point is aligned, 3 if the second point is aligned */
#define ISECT_TRUE 1 #define ISECT_TRUE 1
#define ISECT_TRUE_P1 2 #define ISECT_TRUE_P1 2
@ -1144,7 +1144,7 @@ static void project_face_seams_init(const ProjPaintState *ps, const int face_ind
#endif // PROJ_DEBUG_NOSEAMBLEED #endif // PROJ_DEBUG_NOSEAMBLEED
/* TODO - move to arithb.c */ /* TODO - move to math_geom.c */
/* little sister we only need to know lambda */ /* little sister we only need to know lambda */
#ifndef PROJ_DEBUG_NOSEAMBLEED #ifndef PROJ_DEBUG_NOSEAMBLEED

4
source/blender/makesdna/DNA_action_types.h
View File

@ -303,8 +303,8 @@ typedef enum eRotationModes {
/* quaternion rotations (default, and for older Blender versions) */ /* quaternion rotations (default, and for older Blender versions) */
ROT_MODE_QUAT = 0, ROT_MODE_QUAT = 0,
/* euler rotations - keep in sync with enum in BLI_math.h */ /* euler rotations - keep in sync with enum in BLI_math.h */
ROT_MODE_EUL = 1, /* Blender 'default' (classic) - must be as 1 to sync with arithb defines */ ROT_MODE_EUL = 1, /* Blender 'default' (classic) - must be as 1 to sync with BLI_math_rotation.h defines */
ROT_MODE_XYZ = 1, /* Blender 'default' (classic) - must be as 1 to sync with arithb defines */ ROT_MODE_XYZ = 1,
ROT_MODE_XZY, ROT_MODE_XZY,
ROT_MODE_YXZ, ROT_MODE_YXZ,
ROT_MODE_YZX, ROT_MODE_YZX,