From 99520e3f92e14eb3b7fab3f7decd0914a3da1360 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 17 Oct 2017 13:43:10 +1100 Subject: Cleanup: use 'e' prefix for enum typedefs Convention was only followed loosely, apply to DNA where changes aren't likely to conflict. (Skipped ModifierType for eg). --- source/blender/editors/transform/transform_snap.c | 6 +++--- source/blender/editors/transform/transform_snap_object.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'source/blender/editors/transform') diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 4a7c2decf95..45b8ca3749f 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -105,7 +105,7 @@ static float ResizeBetween(TransInfo *t, const float p1[3], const float p2[3]); /****************** IMPLEMENTATIONS *********************/ -static bool snapNodeTest(View2D *v2d, bNode *node, SnapSelect snap_select); +static bool snapNodeTest(View2D *v2d, bNode *node, eSnapSelect snap_select); static NodeBorder snapNodeBorder(int snap_node_mode); #if 0 @@ -1315,7 +1315,7 @@ bool peelObjectsTransform( /******************** NODES ***********************************/ -static bool snapNodeTest(View2D *v2d, bNode *node, SnapSelect snap_select) +static bool snapNodeTest(View2D *v2d, bNode *node, eSnapSelect snap_select) { /* node is use for snapping only if a) snap mode matches and b) node is inside the view */ return ((snap_select == SNAP_NOT_SELECTED && !(node->flag & NODE_SELECT)) || @@ -1394,7 +1394,7 @@ static bool snapNode( static bool snapNodes( ToolSettings *ts, SpaceNode *snode, ARegion *ar, - const int mval[2], SnapSelect snap_select, + const int mval[2], eSnapSelect snap_select, float r_loc[2], float *r_dist_px, char *r_node_border) { bNodeTree *ntree = snode->edittree; diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 1fdf7c67cff..737005ccf8b 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -145,12 +145,12 @@ typedef void(*IterSnapObjsCallback)(SnapObjectContext *sctx, bool is_obedit, Obj * Walks through all objects in the scene to create the list of objets to snap. * * \param sctx: Snap context to store data. - * \param snap_select : from enum SnapSelect. + * \param snap_select : from enum eSnapSelect. * \param obedit : Object Edited to use its coordinates of BMesh(if any) to do the snapping. */ static void iter_snap_objects( SnapObjectContext *sctx, - const SnapSelect snap_select, + const eSnapSelect snap_select, Object *obedit, IterSnapObjsCallback sob_callback, void *data) @@ -795,7 +795,7 @@ static void raycast_obj_cb(SnapObjectContext *sctx, bool is_obedit, Object *ob, * * \param sctx: Snap context to store data. * \param snapdata: struct generated in `set_snapdata`. - * \param snap_select : from enum SnapSelect. + * \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`). * @@ -819,7 +819,7 @@ static void raycast_obj_cb(SnapObjectContext *sctx, bool is_obedit, Object *ob, static bool raycastObjects( SnapObjectContext *sctx, const float ray_start[3], const float ray_dir[3], - const SnapSelect snap_select, const bool use_object_edit_cage, + const eSnapSelect snap_select, const bool use_object_edit_cage, /* read/write args */ float *ray_depth, /* return args */ @@ -2036,7 +2036,7 @@ static void sanp_obj_cb(SnapObjectContext *sctx, bool is_obedit, Object *ob, flo * * \param sctx: Snap context to store data. * \param snapdata: struct generated in `get_snapdata`. - * \param snap_select : from enum SnapSelect. + * \param snap_select : from enum eSnapSelect. * \param use_object_edit_cage : Uses the coordinates of BMesh(if any) to do the snapping. * * Read/Write Args @@ -2058,7 +2058,7 @@ static void sanp_obj_cb(SnapObjectContext *sctx, bool is_obedit, Object *ob, flo */ static bool snapObjectsRay( SnapObjectContext *sctx, SnapData *snapdata, - const SnapSelect snap_select, const bool use_object_edit_cage, + const eSnapSelect snap_select, const bool use_object_edit_cage, /* read/write args */ float *ray_depth, float *dist_px, /* return args */ -- cgit v1.2.3