diff options
author | mano-wii <germano.costa@ig.com.br> | 2017-08-17 01:10:18 +0300 |
---|---|---|
committer | mano-wii <germano.costa@ig.com.br> | 2017-08-17 01:10:18 +0300 |
commit | 264d0cc6a0fc292f3e5e6ebcdbe9195fb0480279 (patch) | |
tree | 3dc61a68923d05d6255cd2498b7041067da679aa /source/blender/editors/include | |
parent | 4b6c482d69cd35b9527dfe0d0ad7c73dfa8fb1ff (diff) | |
parent | 9b1e0f5af6f11432d7b62b5ba87a4cc0e3175bd1 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_transform.h | 12 | ||||
-rw-r--r-- | source/blender/editors/include/ED_transform_snap_object_context.h | 6 |
2 files changed, 7 insertions, 11 deletions
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index 483caf7c475..84d1edd23ec 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -167,12 +167,6 @@ void ED_widgetgroup_manipulator2d_draw_prepare(const struct bContext *C, struct /* Snapping */ -typedef enum SnapSelect { - SNAP_ALL = 0, - SNAP_NOT_SELECTED = 1, - SNAP_NOT_ACTIVE = 2, -} SnapSelect; - #define SNAP_MIN_DISTANCE 30 bool peelObjectsTransform( @@ -195,11 +189,7 @@ bool snapObjectsTransform( /* return args */ float r_loc[3], float r_no[3]); bool snapNodesTransform( - struct TransInfo *t, const int mval[2], SnapSelect snap_select, - /* return args */ - float r_loc[2], float *r_dist_px, char *r_node_border); -bool snapNodesContext( - struct bContext *C, const int mval[2], SnapSelect snap_select, + struct TransInfo *t, const int mval[2], /* return args */ float r_loc[2], float *r_dist_px, char *r_node_border); diff --git a/source/blender/editors/include/ED_transform_snap_object_context.h b/source/blender/editors/include/ED_transform_snap_object_context.h index 3a042ebfb1d..b802694444b 100644 --- a/source/blender/editors/include/ED_transform_snap_object_context.h +++ b/source/blender/editors/include/ED_transform_snap_object_context.h @@ -42,6 +42,12 @@ struct bContext; /* ED_transform_snap_object_*** API */ +typedef enum SnapSelect { + SNAP_ALL = 0, + SNAP_NOT_SELECTED = 1, + SNAP_NOT_ACTIVE = 2, +} SnapSelect; + /** used for storing multiple hits */ struct SnapObjectHitDepth { struct SnapObjectHitDepth *next, *prev; |