diff options
Diffstat (limited to 'source/blender/editors')
16 files changed, 67 insertions, 67 deletions
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 e440e8c8389..156b0ab36b0 100644 --- a/source/blender/editors/include/ED_transform_snap_object_context.h +++ b/source/blender/editors/include/ED_transform_snap_object_context.h @@ -40,11 +40,11 @@ struct View3D; /* ED_transform_snap_object_*** API */ -typedef enum SnapSelect { +typedef enum eSnapSelect { SNAP_ALL = 0, SNAP_NOT_SELECTED = 1, SNAP_NOT_ACTIVE = 2, -} SnapSelect; +} eSnapSelect; /** used for storing multiple hits */ struct SnapObjectHitDepth { diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index f7dfb4b7fd2..9e93b02a8cd 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -2816,8 +2816,8 @@ static bool ui_textedit_insert_ascii(uiBut *but, uiHandleButtonData *data, char } static void ui_textedit_move( - uiBut *but, uiHandleButtonData *data, strCursorJumpDirection direction, - const bool select, strCursorJumpType jump) + uiBut *but, uiHandleButtonData *data, eStrCursorJumpDirection direction, + const bool select, eStrCursorJumpType jump) { const char *str = data->str; const int len = strlen(str); @@ -2893,7 +2893,7 @@ static void ui_textedit_move( } } -static bool ui_textedit_delete(uiBut *but, uiHandleButtonData *data, int direction, strCursorJumpType jump) +static bool ui_textedit_delete(uiBut *but, uiHandleButtonData *data, int direction, eStrCursorJumpType jump) { char *str = data->str; const int len = strlen(str); diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 122330f7ede..4825271876c 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -87,7 +87,7 @@ typedef struct BakeAPIRender { ReportList *reports; ListBase selected_objects; - ScenePassType pass_type; + eScenePassType pass_type; int pass_filter; int margin; @@ -101,7 +101,7 @@ typedef struct BakeAPIRender { float cage_extrusion; int normal_space; - BakeNormalSwizzle normal_swizzle[3]; + eBakeNormalSwizzle normal_swizzle[3]; char uv_layer[MAX_CUSTOMDATA_LAYER_NAME]; char custom_cage[MAX_NAME]; @@ -340,7 +340,7 @@ static bool write_external_bake_pixels( return ok; } -static bool is_noncolor_pass(ScenePassType pass_type) +static bool is_noncolor_pass(eScenePassType pass_type) { return ELEM(pass_type, SCE_PASS_Z, @@ -431,7 +431,7 @@ static bool bake_object_check(Scene *scene, Object *ob, ReportList *reports) return true; } -static bool bake_pass_filter_check(ScenePassType pass_type, const int pass_filter, ReportList *reports) +static bool bake_pass_filter_check(eScenePassType pass_type, const int pass_filter, ReportList *reports) { switch (pass_type) { case SCE_PASS_COMBINED: @@ -634,10 +634,10 @@ static Mesh *bake_mesh_new_from_object(Main *bmain, Scene *scene, Object *ob) static int bake( Render *re, Main *bmain, Scene *scene, Object *ob_low, ListBase *selected_objects, ReportList *reports, - const ScenePassType pass_type, const int pass_filter, const int margin, - const BakeSaveMode save_mode, const bool is_clear, const bool is_split_materials, + const eScenePassType pass_type, const int pass_filter, const int margin, + const eBakeSaveMode save_mode, const bool is_clear, const bool is_split_materials, const bool is_automatic_name, const bool is_selected_to_active, const bool is_cage, - const float cage_extrusion, const int normal_space, const BakeNormalSwizzle normal_swizzle[], + const float cage_extrusion, const int normal_space, const eBakeNormalSwizzle normal_swizzle[], const char *custom_cage, const char *filepath, const int width, const int height, const char *identifier, ScrArea *sa, const char *uv_layer) { diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 4a96a2e2200..76a9d7d22a6 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1647,7 +1647,7 @@ static const char *object_mode_op_string(int mode) /* checks the mode to be set is compatible with the object * should be made into a generic function */ -static bool object_mode_compat_test(Object *ob, ObjectMode mode) +static bool object_mode_compat_test(Object *ob, eObjectMode mode) { if (ob) { if (mode == OB_MODE_OBJECT) @@ -1725,8 +1725,8 @@ static int object_mode_set_exec(bContext *C, wmOperator *op) { Object *ob = CTX_data_active_object(C); bGPdata *gpd = CTX_data_gpencil_data(C); - ObjectMode mode = RNA_enum_get(op->ptr, "mode"); - ObjectMode restore_mode = (ob) ? ob->mode : OB_MODE_OBJECT; + eObjectMode mode = RNA_enum_get(op->ptr, "mode"); + eObjectMode restore_mode = (ob) ? ob->mode : OB_MODE_OBJECT; const bool toggle = RNA_boolean_get(op->ptr, "toggle"); if (gpd) { diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index 0cf39644bc1..f0d9a0bbb68 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -249,12 +249,12 @@ static int load_tex(Brush *br, ViewContext *vc, float zoom, bool col, bool prima TexSnapshot *target; MTex *mtex = (primary) ? &br->mtex : &br->mask_mtex; - OverlayControlFlags overlay_flags = BKE_paint_get_overlay_flags(); + eOverlayControlFlags overlay_flags = BKE_paint_get_overlay_flags(); GLubyte *buffer = NULL; int size; bool refresh; - OverlayControlFlags invalid = (primary) ? (overlay_flags & PAINT_INVALID_OVERLAY_TEXTURE_PRIMARY) : + eOverlayControlFlags invalid = (primary) ? (overlay_flags & PAINT_INVALID_OVERLAY_TEXTURE_PRIMARY) : (overlay_flags & PAINT_INVALID_OVERLAY_TEXTURE_SECONDARY); target = (primary) ? &primary_snap : &secondary_snap; @@ -399,7 +399,7 @@ static int load_tex_cursor(Brush *br, ViewContext *vc, float zoom) { bool init; - OverlayControlFlags overlay_flags = BKE_paint_get_overlay_flags(); + eOverlayControlFlags overlay_flags = BKE_paint_get_overlay_flags(); GLubyte *buffer = NULL; int size; @@ -770,11 +770,11 @@ static void paint_draw_cursor_overlay(UnifiedPaintSettings *ups, Brush *brush, } static void paint_draw_alpha_overlay(UnifiedPaintSettings *ups, Brush *brush, - ViewContext *vc, int x, int y, float zoom, PaintMode mode) + ViewContext *vc, int x, int y, float zoom, ePaintMode mode) { /* color means that primary brush texture is colured and secondary is used for alpha/mask control */ bool col = ELEM(mode, ePaintTextureProjective, ePaintTexture2D, ePaintVertex) ? true : false; - OverlayControlFlags flags = BKE_paint_get_overlay_flags(); + eOverlayControlFlags flags = BKE_paint_get_overlay_flags(); /* save lots of GL state * TODO: check on whether all of these are needed? */ glPushAttrib(GL_COLOR_BUFFER_BIT | @@ -971,7 +971,7 @@ static void paint_cursor_on_hit(UnifiedPaintSettings *ups, Brush *brush, ViewCon } } -static bool ommit_cursor_drawing(Paint *paint, PaintMode mode, Brush *brush) +static bool ommit_cursor_drawing(Paint *paint, ePaintMode mode, Brush *brush) { if (paint->flags & PAINT_SHOW_BRUSH) { if (ELEM(mode, ePaintTexture2D, ePaintTextureProjective) && brush->imagepaint_tool == PAINT_TOOL_FILL) { @@ -988,7 +988,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused)) UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings; Paint *paint = BKE_paint_get_active_from_context(C); Brush *brush = BKE_paint_brush(paint); - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); ViewContext vc; float final_radius; float translation[2]; diff --git a/source/blender/editors/sculpt_paint/paint_curve.c b/source/blender/editors/sculpt_paint/paint_curve.c index 9704db9d035..0ee78d61fb8 100644 --- a/source/blender/editors/sculpt_paint/paint_curve.c +++ b/source/blender/editors/sculpt_paint/paint_curve.c @@ -128,7 +128,7 @@ static void paintcurve_undo_delete(ListBase *lb) static void paintcurve_undo_begin(bContext *C, wmOperator *op, PaintCurve *pc) { - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); ListBase *lb = NULL; int undo_stack_id; UndoCurve *uc; @@ -733,7 +733,7 @@ void PAINTCURVE_OT_slide(wmOperatorType *ot) static int paintcurve_draw_exec(bContext *C, wmOperator *UNUSED(op)) { - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); const char *name; switch (mode) { @@ -774,7 +774,7 @@ void PAINTCURVE_OT_draw(wmOperatorType *ot) static int paintcurve_cursor_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) { - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); switch (mode) { case ePaintTexture2D: diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 79ce440251d..5343aa72b01 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -510,7 +510,7 @@ BlurKernel *paint_new_blur_kernel(Brush *br, bool proj) BlurKernel *kernel = MEM_mallocN(sizeof(BlurKernel), "blur kernel"); float radius; int side; - BlurKernelType type = br->blur_mode; + eBlurKernelType type = br->blur_mode; if (proj) { radius = 0.5f; @@ -624,13 +624,13 @@ static int image_paint_2d_clone_poll(bContext *C) } /************************ paint operator ************************/ -typedef enum TexPaintMode { +typedef enum eTexPaintMode { PAINT_MODE_2D, PAINT_MODE_3D_PROJECT -} TexPaintMode; +} eTexPaintMode; typedef struct PaintOperation { - TexPaintMode mode; + eTexPaintMode mode; void *custom_paint; @@ -1186,7 +1186,7 @@ static int sample_color_exec(bContext *C, wmOperator *op) { Paint *paint = BKE_paint_get_active_from_context(C); Brush *brush = BKE_paint_brush(paint); - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); ARegion *ar = CTX_wm_region(C); wmWindow *win = CTX_wm_window(C); const bool show_cursor = ((paint->flags & PAINT_SHOW_BRUSH) != 0); @@ -1238,7 +1238,7 @@ static int sample_color_invoke(bContext *C, wmOperator *op, const wmEvent *event RNA_int_set_array(op->ptr, "location", event->mval); - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); const bool use_sample_texture = (mode == ePaintTextureProjective) && !RNA_boolean_get(op->ptr, "merged"); paint_sample_color(C, ar, event->mval[0], event->mval[1], use_sample_texture, false); @@ -1274,7 +1274,7 @@ static int sample_color_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_FINISHED; } - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); const bool use_sample_texture = (mode == ePaintTextureProjective) && !RNA_boolean_get(op->ptr, "merged"); switch (event->type) { diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h index f6fcbfdfbee..48fcf0596e3 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.h +++ b/source/blender/editors/sculpt_paint/paint_intern.h @@ -54,7 +54,7 @@ struct wmOperator; struct wmOperatorType; struct wmWindowManager; struct DMCoNo; -enum PaintMode; +enum ePaintMode; /* paint_stroke.c */ typedef bool (*StrokeGetLocation)(struct bContext *C, float location[3], const float mouse[2]); @@ -69,12 +69,12 @@ struct PaintStroke *paint_stroke_new(struct bContext *C, struct wmOperator *op, StrokeDone done, int event_type); void paint_stroke_data_free(struct wmOperator *op); -bool paint_space_stroke_enabled(struct Brush *br, enum PaintMode mode); -bool paint_supports_dynamic_size(struct Brush *br, enum PaintMode mode); -bool paint_supports_dynamic_tex_coords(struct Brush *br, enum PaintMode mode); -bool paint_supports_smooth_stroke(struct Brush *br, enum PaintMode mode); -bool paint_supports_texture(enum PaintMode mode); -bool paint_supports_jitter(enum PaintMode mode); +bool paint_space_stroke_enabled(struct Brush *br, enum ePaintMode mode); +bool paint_supports_dynamic_size(struct Brush *br, enum ePaintMode mode); +bool paint_supports_dynamic_tex_coords(struct Brush *br, enum ePaintMode mode); +bool paint_supports_smooth_stroke(struct Brush *br, enum ePaintMode mode); +bool paint_supports_texture(enum ePaintMode mode); +bool paint_supports_jitter(enum ePaintMode mode); struct wmKeyMap *paint_stroke_modal_keymap(struct wmKeyConfig *keyconf); int paint_stroke_modal(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); @@ -336,7 +336,7 @@ typedef struct { int pixel_len; /* pixels around center that kernel is wide */ } BlurKernel; -enum BlurKernelType; +enum eBlurKernelType; /* can be extended to other blur kernels later */ BlurKernel *paint_new_blur_kernel(struct Brush *br, bool proj); void paint_delete_blur_kernel(BlurKernel *); diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index 2899cfeedcf..d3dcf283052 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -66,7 +66,7 @@ static int brush_add_exec(bContext *C, wmOperator *UNUSED(op)) Paint *paint = BKE_paint_get_active_from_context(C); Brush *br = BKE_paint_brush(paint); Main *bmain = CTX_data_main(C); - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); if (br) br = BKE_brush_copy(bmain, br); @@ -195,7 +195,7 @@ static int palette_color_add_exec(bContext *C, wmOperator *UNUSED(op)) Scene *scene = CTX_data_scene(C); Paint *paint = BKE_paint_get_active_from_context(C); Brush *brush = paint->brush; - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); Palette *palette = paint->palette; PaletteColor *color; @@ -776,7 +776,7 @@ static int stencil_control_modal(bContext *C, wmOperator *op, const wmEvent *eve static int stencil_control_poll(bContext *C) { - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); Paint *paint; Brush *br; diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index bb2cd52a41e..2c8e88e3ccb 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -192,7 +192,7 @@ static void paint_draw_line_cursor(bContext *C, int x, int y, void *customdata) glDisable(GL_LINE_SMOOTH); } -static bool paint_tool_require_location(Brush *brush, PaintMode mode) +static bool paint_tool_require_location(Brush *brush, ePaintMode mode) { switch (mode) { case ePaintSculpt: @@ -214,7 +214,7 @@ static bool paint_tool_require_location(Brush *brush, PaintMode mode) /* Initialize the stroke cache variants from operator properties */ static bool paint_brush_update(bContext *C, Brush *brush, - PaintMode mode, + ePaintMode mode, struct PaintStroke *stroke, const float mouse_init[2], float mouse[2], float pressure, @@ -396,7 +396,7 @@ static bool paint_brush_update(bContext *C, return location_success; } -static bool paint_stroke_use_jitter(PaintMode mode, Brush *brush, bool invert) +static bool paint_stroke_use_jitter(ePaintMode mode, Brush *brush, bool invert) { bool use_jitter = (brush->flag & BRUSH_ABSOLUTE_JITTER) ? (brush->jitter_absolute != 0) : (brush->jitter != 0); @@ -416,7 +416,7 @@ static void paint_brush_stroke_add_step(bContext *C, wmOperator *op, const float { Scene *scene = CTX_data_scene(C); Paint *paint = BKE_paint_get_active_from_context(C); - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); Brush *brush = BKE_paint_brush(paint); PaintStroke *stroke = op->customdata; UnifiedPaintSettings *ups = stroke->ups; @@ -491,7 +491,7 @@ static void paint_brush_stroke_add_step(bContext *C, wmOperator *op, const float /* Returns zero if no sculpt changes should be made, non-zero otherwise */ static bool paint_smooth_stroke( - PaintStroke *stroke, const PaintSample *sample, PaintMode mode, + PaintStroke *stroke, const PaintSample *sample, ePaintMode mode, float r_mouse[2], float *r_pressure) { if (paint_supports_smooth_stroke(stroke->brush, mode)) { @@ -757,7 +757,7 @@ static void stroke_done(struct bContext *C, struct wmOperator *op) } /* Returns zero if the stroke dots should not be spaced, non-zero otherwise */ -bool paint_space_stroke_enabled(Brush *br, PaintMode mode) +bool paint_space_stroke_enabled(Brush *br, ePaintMode mode) { return (br->flag & BRUSH_SPACE) && paint_supports_dynamic_size(br, mode); } @@ -772,7 +772,7 @@ static bool sculpt_is_grab_tool(Brush *br) } /* return true if the brush size can change during paint (normally used for pressure) */ -bool paint_supports_dynamic_size(Brush *br, PaintMode mode) +bool paint_supports_dynamic_size(Brush *br, ePaintMode mode) { if (br->flag & BRUSH_ANCHORED) return false; @@ -798,7 +798,7 @@ bool paint_supports_dynamic_size(Brush *br, PaintMode mode) return true; } -bool paint_supports_smooth_stroke(Brush *br, PaintMode mode) +bool paint_supports_smooth_stroke(Brush *br, ePaintMode mode) { if (!(br->flag & BRUSH_SMOOTH_STROKE) || (br->flag & (BRUSH_ANCHORED | BRUSH_DRAG_DOT | BRUSH_LINE))) @@ -817,14 +817,14 @@ bool paint_supports_smooth_stroke(Brush *br, PaintMode mode) return true; } -bool paint_supports_texture(PaintMode mode) +bool paint_supports_texture(ePaintMode mode) { /* omit: PAINT_WEIGHT, PAINT_SCULPT_UV, PAINT_INVALID */ return ELEM(mode, ePaintSculpt, ePaintVertex, ePaintTextureProjective, ePaintTexture2D); } /* return true if the brush size can change during paint (normally used for pressure) */ -bool paint_supports_dynamic_tex_coords(Brush *br, PaintMode mode) +bool paint_supports_dynamic_tex_coords(Brush *br, ePaintMode mode) { if (br->flag & BRUSH_ANCHORED) return false; @@ -1086,7 +1086,7 @@ static void paint_stroke_line_constrain(PaintStroke *stroke, float mouse[2]) int paint_stroke_modal(bContext *C, wmOperator *op, const wmEvent *event) { Paint *p = BKE_paint_get_active_from_context(C); - PaintMode mode = BKE_paintmode_get_active_from_context(C); + ePaintMode mode = BKE_paintmode_get_active_from_context(C); PaintStroke *stroke = op->customdata; Brush *br = stroke->brush; PaintSample sample_average; diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index b02e547d0df..b2196bf6237 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -285,7 +285,7 @@ static void imapaint_pick_uv(Scene *scene, Object *ob, unsigned int faceindex, c float p[2], w[3], absw, minabsw; float matrix[4][4], proj[4][4]; GLint view[4]; - const ImagePaintMode mode = scene->toolsettings->imapaint.mode; + const eImageePaintMode mode = scene->toolsettings->imapaint.mode; const MLoopTri *lt = dm->getLoopTriArray(dm); const MPoly *mpoly = dm->getPolyArray(dm); const MLoop *mloop = dm->getLoopArray(dm); diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 1f0d8e5d29b..64404b38da3 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -3916,7 +3916,7 @@ static const char *sculpt_tool_name(Sculpt *sd) { Brush *brush = BKE_paint_brush(&sd->paint); - switch ((BrushSculptTool)brush->sculpt_tool) { + switch ((eBrushSculptTool)brush->sculpt_tool) { case SCULPT_TOOL_DRAW: return "Draw Brush"; case SCULPT_TOOL_SMOOTH: diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 64c1e6f1d1d..5ea727cf17f 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -105,7 +105,7 @@ static void file_deselect_all(SpaceFile *sfile, unsigned int flag) filelist_entries_select_index_range_set(sfile->files, &sel, FILE_SEL_REMOVE, flag, CHECK_ALL); } -typedef enum FileSelect { +typedef enum FileSelect { FILE_SELECT_NOTHING = 0, FILE_SELECT_DIR = 1, FILE_SELECT_FILE = 2 diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 5f01092f5b0..087f1a28316 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -631,7 +631,7 @@ void drawaxes(const float viewmat_local[4][4], float size, char drawtype) /* Function to draw an Image on an empty Object */ -static void draw_empty_image(Object *ob, const short dflag, const unsigned char ob_wire_col[4], StereoViews sview) +static void draw_empty_image(Object *ob, const short dflag, const unsigned char ob_wire_col[4], eStereoViews sview) { Image *ima = ob->data; ImBuf *ibuf; 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 */ |