archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Germano Cavalcante
2017-08-16 19:10:18 -03:00
parent 4b6c482d69 9b1e0f5af6
commit 264d0cc6a0
7 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/include/ED_transform.h
View File

@@ -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);