diff options
author | Martin Poirier <theeth@yahoo.com> | 2012-03-11 01:40:35 +0400 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2012-03-11 01:40:35 +0400 |
commit | 67f1e83508ac1312b6b41093cb1946363ce3d0fd (patch) | |
tree | 7b412752e0cea4d243b1dd4868b066d34f952eb2 /source/blender/editors/include | |
parent | e09ab8883ce0e41add94058ecd4045ac5efa74c6 (diff) |
[#30373] Which part to snap in volume snapping is removed
By Bug reported by Pep Ribal
Also fixed an object mode bug with volume snapping and made it compatible with the edit mode "Snap on self" option
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_numinput.h | 9 | ||||
-rw-r--r-- | source/blender/editors/include/ED_transform.h | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/source/blender/editors/include/ED_numinput.h b/source/blender/editors/include/ED_numinput.h index 2b99e52057d..e723ff73532 100644 --- a/source/blender/editors/include/ED_numinput.h +++ b/source/blender/editors/include/ED_numinput.h @@ -28,6 +28,15 @@ #define __ED_NUMINPUT_H__ +/* + The ctrl value has different meaning: + 0 : No value has been typed + + otherwise, |value| - 1 is where the cursor is located after the period + Positive : number is positive + Negative : number is negative +*/ + typedef struct NumInput { short idx; short idx_max; diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index 4532a351c7d..f6dee351c29 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -175,8 +175,8 @@ typedef enum SnapMode #define SNAP_MIN_DISTANCE 30 -int peelObjectsTransForm(struct TransInfo *t, struct ListBase *depth_peels, const float mval[2]); -int peelObjectsContext(struct bContext *C, struct ListBase *depth_peels, const float mval[2]); +int peelObjectsTransForm(struct TransInfo *t, struct ListBase *depth_peels, const float mval[2], SnapMode mode); +int peelObjectsContext(struct bContext *C, struct ListBase *depth_peels, const float mval[2], SnapMode mode); int snapObjectsTransform(struct TransInfo *t, const float mval[2], int *r_dist, float r_loc[3], float r_no[3], SnapMode mode); int snapObjectsContext(struct bContext *C, const float mval[2], int *r_dist, float r_loc[3], float r_no[3], SnapMode mode); |