diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-12 04:36:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-12 04:36:10 +0300 |
commit | 4f343642b14f67b595720542deac89eaf18852fb (patch) | |
tree | e055b9b8426edf00438f540ff1a2d2e4928b0987 /source/blender/editors/sculpt_paint | |
parent | 1ad15c37aa60ec223f072cdca2209e1017c3d8ef (diff) |
isect_seg_seg_v2_point was modifying the value of line vectors passed.
this could be confusing later on, now swap the pointers rather then changing their values.
Diffstat (limited to 'source/blender/editors/sculpt_paint')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 3c116d3b763..84816cebc46 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -163,17 +163,17 @@ typedef struct ImagePaintRegion { #define PROJ_DEBUG_WINCLIP 1 /* projectFaceSeamFlags options */ -//#define PROJ_FACE_IGNORE 1<<0 /* When the face is hidden, backfacing or occluded */ -//#define PROJ_FACE_INIT 1<<1 /* When we have initialized the faces data */ -#define PROJ_FACE_SEAM1 1<<0 /* If this face has a seam on any of its edges */ -#define PROJ_FACE_SEAM2 1<<1 -#define PROJ_FACE_SEAM3 1<<2 -#define PROJ_FACE_SEAM4 1<<3 - -#define PROJ_FACE_NOSEAM1 1<<4 -#define PROJ_FACE_NOSEAM2 1<<5 -#define PROJ_FACE_NOSEAM3 1<<6 -#define PROJ_FACE_NOSEAM4 1<<7 +//#define PROJ_FACE_IGNORE (1<<0) /* When the face is hidden, backfacing or occluded */ +//#define PROJ_FACE_INIT (1<<1) /* When we have initialized the faces data */ +#define PROJ_FACE_SEAM1 (1<<0) /* If this face has a seam on any of its edges */ +#define PROJ_FACE_SEAM2 (1<<1) +#define PROJ_FACE_SEAM3 (1<<2) +#define PROJ_FACE_SEAM4 (1<<3) + +#define PROJ_FACE_NOSEAM1 (1<<4) +#define PROJ_FACE_NOSEAM2 (1<<5) +#define PROJ_FACE_NOSEAM3 (1<<6) +#define PROJ_FACE_NOSEAM4 (1<<7) #define PROJ_SRC_VIEW 1 #define PROJ_SRC_IMAGE_CAM 2 @@ -189,8 +189,8 @@ typedef struct ImagePaintRegion { #define PROJ_FACE_SCALE_SEAM 0.99f #define PROJ_BUCKET_NULL 0 -#define PROJ_BUCKET_INIT 1<<0 -// #define PROJ_BUCKET_CLONE_INIT 1<<1 +#define PROJ_BUCKET_INIT (1<<0) +// #define PROJ_BUCKET_CLONE_INIT (1<<1) /* used for testing doubles, if a point is on a line etc */ #define PROJ_GEOM_TOLERANCE 0.00075f |