diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-03 13:48:21 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-03 13:48:21 +0400 |
commit | 9a901691ee22119661f70d16004641b0b0b0cb66 (patch) | |
tree | 2de13231a9f307f3b0b5cd029d3436aa2c640888 /source/blender/editors/include/ED_transform.h | |
parent | bb4ab6a007ddc1130cc80439c9d4cd89c8117fb6 (diff) |
pass snap arguments so the ruler doesn't have to temp overwrite scene vars.
also expose snapObjectsRayEx() for more convenient ray-casting about the scene.
Diffstat (limited to 'source/blender/editors/include/ED_transform.h')
-rw-r--r-- | source/blender/editors/include/ED_transform.h | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index 08ed607dded..f0992655ad3 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -34,17 +34,18 @@ /* ******************* Registration Function ********************** */ -struct wmWindowManager; -struct wmOperatorType; +struct ARegion; +struct EnumPropertyItem; struct ListBase; -struct wmEvent; -struct bContext; struct Object; +struct View3D; +struct bContext; struct uiLayout; -struct EnumPropertyItem; -struct wmOperatorType; -struct wmKeyMap; +struct wmEvent; struct wmKeyConfig; +struct wmKeyMap; +struct wmOperatorType; +struct wmWindowManager; void transform_keymap_for_space(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap, int spaceid); void transform_operatortypes(void); @@ -181,6 +182,13 @@ bool peelObjectsTransForm(struct TransInfo *t, struct ListBase *depth_peels, con bool peelObjectsContext(struct bContext *C, struct ListBase *depth_peels, const float mval[2], SnapMode mode); bool snapObjectsTransform(struct TransInfo *t, const float mval[2], float *r_dist_px, float r_loc[3], float r_no[3], SnapMode mode); bool snapObjectsContext(struct bContext *C, const float mval[2], float *r_dist_px, float r_loc[3], float r_no[3], SnapMode mode); +/* taks args for all settings */ +bool snapObjectsEx(struct Scene *scene, struct Base *base_act, struct View3D *v3d, struct ARegion *ar, struct Object *obedit, short snap_mode, + const float mval[2], float *r_dist_px, float r_loc[3], float r_no[3], SnapMode mode); +bool snapObjectsRayEx(struct Scene *scene, struct Base *base_act, struct View3D *v3d, struct ARegion *ar, struct Object *obedit, short snap_mode, + const float ray_start[3], const float ray_normal[3], + const float mval[2], float *r_dist_px, float r_loc[3], float r_no[3], SnapMode mode); + bool snapNodesTransform(struct TransInfo *t, const int mval[2], float *r_dist_px, float r_loc[2], char *r_node_border, SnapMode mode); bool snapNodesContext(struct bContext *C, const int mval[2], float *r_dist_px, float r_loc[2], char *r_node_border, SnapMode mode); |