diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-13 18:15:37 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-13 18:15:37 +0300 |
commit | 585208e0e911c985a062dd74b6cc689e4fb63ef8 (patch) | |
tree | d390abe6663c5619d34dc929d68a24775d24d7fb /source/blender/editors/transform/transform_snap_object.c | |
parent | c99c45a1e3563f4b6dad6eb9498a5ae0f386b93d (diff) | |
parent | be25a0faa7ff0f64e9d75f5f48c042bb8595f142 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/transform/transform_snap_object.c')
-rw-r--r-- | source/blender/editors/transform/transform_snap_object.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 14cd4bcc7ac..0020b0924bb 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -62,6 +62,10 @@ #include "transform.h" +/* -------------------------------------------------------------------- */ +/** Internal Data Types + * \{ */ + enum eViewProj { VIEW_PROJ_NONE = -1, VIEW_PROJ_ORTHO = 0, @@ -137,10 +141,8 @@ struct SnapObjectContext { /** \} */ - /* -------------------------------------------------------------------- */ - -/** Common utilities +/** Common Utilities * \{ */ @@ -260,9 +262,7 @@ static int dm_looptri_to_poly_index(DerivedMesh *dm, const MLoopTri *lt); /** \} */ - /* -------------------------------------------------------------------- */ - /** \name Ray Cast Funcs * \{ */ @@ -789,7 +789,6 @@ static void raycast_obj_cb(SnapObjectContext *sctx, bool is_obedit, Object *ob, * Walks through all objects in the scene to find the `hit` on object surface. * * \param sctx: Snap context to store data. - * \param snapdata: struct generated in `set_snapdata`. * \param snap_select : from enum eSnapSelect. * \param use_object_edit_cage : Uses the coordinates of BMesh(if any) to do the snapping. * \param obj_list: List with objects to snap (created in `create_object_list`). @@ -846,9 +845,7 @@ static bool raycastObjects( /** \} */ - /* -------------------------------------------------------------------- */ - /** Snap Nearest utilities * \{ */ @@ -1158,9 +1155,7 @@ static float dist_squared_to_projected_aabb_simple( /** \} */ - /* -------------------------------------------------------------------- */ - /** Walk DFS * \{ */ @@ -1256,7 +1251,6 @@ static bool cb_nearest_walk_order(const BVHTreeAxisRange *UNUSED(bounds), char a /** \} */ /* -------------------------------------------------------------------- */ - /** \name Internal Object Snapping API * \{ */ @@ -2080,9 +2074,7 @@ static bool snapObjectsRay( /** \} */ - /* -------------------------------------------------------------------- */ - /** \name Public Object Snapping API * \{ */ |