diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-01-02 05:08:20 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-02 05:08:20 +0300 |
commit | e9ac7842378182b48749c37be3e9f573d273c112 (patch) | |
tree | d78dc768d61edea043774903ea4b820d6321cb6c /source/blender/editors/uvedit/uvedit_ops.c | |
parent | d27fb4671512a3834b61c5c350f428ddccc4669e (diff) |
Cleanup: quiet const warnings
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_ops.c')
-rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 129 |
1 files changed, 75 insertions, 54 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 1de4d05a721..33fcd67f6ed 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -274,7 +274,7 @@ bool uvedit_face_visible_nolocal_ex(const ToolSettings *ts, BMFace *efa) return (BM_elem_flag_test(efa, BM_ELEM_HIDDEN) == 0 && BM_elem_flag_test(efa, BM_ELEM_SELECT)); } } -bool uvedit_face_visible_nolocal(Scene *scene, BMFace *efa) +bool uvedit_face_visible_nolocal(const Scene *scene, BMFace *efa) { return uvedit_face_visible_nolocal_ex(scene->toolsettings, efa); } @@ -290,7 +290,7 @@ bool uvedit_face_visible_test_ex(const ToolSettings *ts, Object *obedit, Image * return uvedit_face_visible_nolocal_ex(ts, efa); } } -bool uvedit_face_visible_test(Scene *scene, Object *obedit, Image *ima, BMFace *efa) +bool uvedit_face_visible_test(const Scene *scene, Object *obedit, Image *ima, BMFace *efa) { return uvedit_face_visible_test_ex(scene->toolsettings, obedit, ima, efa); } @@ -315,12 +315,12 @@ bool uvedit_face_select_test_ex(const ToolSettings *ts, BMFace *efa, const int c return true; } } -bool uvedit_face_select_test(Scene *scene, BMFace *efa, const int cd_loop_uv_offset) +bool uvedit_face_select_test(const Scene *scene, BMFace *efa, const int cd_loop_uv_offset) { return uvedit_face_select_test_ex(scene->toolsettings, efa, cd_loop_uv_offset); } -bool uvedit_face_select_set(struct Scene *scene, +bool uvedit_face_select_set(const struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa, const bool select, @@ -335,10 +335,13 @@ bool uvedit_face_select_set(struct Scene *scene, } } -bool uvedit_face_select_enable( - Scene *scene, BMEditMesh *em, BMFace *efa, const bool do_history, const int cd_loop_uv_offset) +bool uvedit_face_select_enable(const Scene *scene, + BMEditMesh *em, + BMFace *efa, + const bool do_history, + const int cd_loop_uv_offset) { - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; if (ts->uv_flag & UV_SYNC_SELECTION) { BM_face_select_set(em->bm, efa, true); @@ -362,12 +365,12 @@ bool uvedit_face_select_enable( return false; } -bool uvedit_face_select_disable(Scene *scene, +bool uvedit_face_select_disable(const Scene *scene, BMEditMesh *em, BMFace *efa, const int cd_loop_uv_offset) { - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; if (ts->uv_flag & UV_SYNC_SELECTION) { BM_face_select_set(em->bm, efa, false); @@ -411,13 +414,13 @@ bool uvedit_edge_select_test_ex(const ToolSettings *ts, BMLoop *l, const int cd_ return (luv1->flag & MLOOPUV_VERTSEL) && (luv2->flag & MLOOPUV_VERTSEL); } } -bool uvedit_edge_select_test(Scene *scene, BMLoop *l, const int cd_loop_uv_offset) +bool uvedit_edge_select_test(const Scene *scene, BMLoop *l, const int cd_loop_uv_offset) { return uvedit_edge_select_test_ex(scene->toolsettings, l, cd_loop_uv_offset); } void uvedit_edge_select_set(BMEditMesh *em, - Scene *scene, + const Scene *scene, BMLoop *l, const bool select, const bool do_history, @@ -432,11 +435,14 @@ void uvedit_edge_select_set(BMEditMesh *em, } } -void uvedit_edge_select_enable( - BMEditMesh *em, Scene *scene, BMLoop *l, const bool do_history, const int cd_loop_uv_offset) +void uvedit_edge_select_enable(BMEditMesh *em, + const Scene *scene, + BMLoop *l, + const bool do_history, + const int cd_loop_uv_offset) { - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; if (ts->uv_flag & UV_SYNC_SELECTION) { if (ts->selectmode & SCE_SELECT_FACE) { @@ -466,12 +472,12 @@ void uvedit_edge_select_enable( } void uvedit_edge_select_disable(BMEditMesh *em, - Scene *scene, + const Scene *scene, BMLoop *l, const int cd_loop_uv_offset) { - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; if (ts->uv_flag & UV_SYNC_SELECTION) { if (ts->selectmode & SCE_SELECT_FACE) { @@ -511,13 +517,13 @@ bool uvedit_uv_select_test_ex(const ToolSettings *ts, BMLoop *l, const int cd_lo return (luv->flag & MLOOPUV_VERTSEL) != 0; } } -bool uvedit_uv_select_test(Scene *scene, BMLoop *l, const int cd_loop_uv_offset) +bool uvedit_uv_select_test(const Scene *scene, BMLoop *l, const int cd_loop_uv_offset) { return uvedit_uv_select_test_ex(scene->toolsettings, l, cd_loop_uv_offset); } void uvedit_uv_select_set(BMEditMesh *em, - Scene *scene, + const Scene *scene, BMLoop *l, const bool select, const bool do_history, @@ -531,10 +537,13 @@ void uvedit_uv_select_set(BMEditMesh *em, } } -void uvedit_uv_select_enable( - BMEditMesh *em, Scene *scene, BMLoop *l, const bool do_history, const int cd_loop_uv_offset) +void uvedit_uv_select_enable(BMEditMesh *em, + const Scene *scene, + BMLoop *l, + const bool do_history, + const int cd_loop_uv_offset) { - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; if (ts->uv_flag & UV_SYNC_SELECTION) { if (ts->selectmode & SCE_SELECT_FACE) { @@ -554,9 +563,12 @@ void uvedit_uv_select_enable( } } -void uvedit_uv_select_disable(BMEditMesh *em, Scene *scene, BMLoop *l, const int cd_loop_uv_offset) +void uvedit_uv_select_disable(BMEditMesh *em, + const Scene *scene, + BMLoop *l, + const int cd_loop_uv_offset) { - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; if (ts->uv_flag & UV_SYNC_SELECTION) { if (ts->selectmode & SCE_SELECT_FACE) { @@ -618,7 +630,7 @@ void uv_poly_copy_aspect(float uv_orig[][2], float uv[][2], float aspx, float as } } -bool ED_uvedit_minmax_multi(Scene *scene, +bool ED_uvedit_minmax_multi(const Scene *scene, Image *ima, Object **objects_edit, uint objects_len, @@ -656,7 +668,8 @@ bool ED_uvedit_minmax_multi(Scene *scene, return changed; } -bool ED_uvedit_minmax(Scene *scene, Image *ima, Object *obedit, float r_min[2], float r_max[2]) +bool ED_uvedit_minmax( + const Scene *scene, Image *ima, Object *obedit, float r_min[2], float r_max[2]) { return ED_uvedit_minmax_multi(scene, ima, &obedit, 1, r_min, r_max); } @@ -680,7 +693,7 @@ void ED_uvedit_select_all(BMesh *bm) } static bool ED_uvedit_median_multi( - Scene *scene, Image *ima, Object **objects_edit, uint objects_len, float co[2]) + const Scene *scene, Image *ima, Object **objects_edit, uint objects_len, float co[2]) { unsigned int sel = 0; zero_v2(co); @@ -724,8 +737,12 @@ static bool UNUSED_FUNCTION(ED_uvedit_median)(Scene *scene, return ED_uvedit_median_multi(scene, ima, &obedit, 1, co); } -bool ED_uvedit_center_multi( - Scene *scene, Image *ima, Object **objects_edit, uint objects_len, float cent[2], char mode) +bool ED_uvedit_center_multi(const Scene *scene, + Image *ima, + Object **objects_edit, + uint objects_len, + float cent[2], + char mode) { bool changed = false; @@ -745,7 +762,7 @@ bool ED_uvedit_center_multi( return changed; } -bool ED_uvedit_center(Scene *scene, Image *ima, Object *obedit, float cent[2], char mode) +bool ED_uvedit_center(const Scene *scene, Image *ima, Object *obedit, float cent[2], char mode) { return ED_uvedit_center_multi(scene, ima, &obedit, 1, cent, mode); } @@ -976,8 +993,12 @@ bool uv_find_nearest_vert_multi(Scene *scene, return found; } -bool ED_uvedit_nearest_uv( - Scene *scene, Object *obedit, Image *ima, const float co[2], float *dist_sq, float r_uv[2]) +bool ED_uvedit_nearest_uv(const Scene *scene, + Object *obedit, + Image *ima, + const float co[2], + float *dist_sq, + float r_uv[2]) { BMEditMesh *em = BKE_editmesh_from_object(obedit); BMIter iter; @@ -1011,7 +1032,7 @@ bool ED_uvedit_nearest_uv( } } -bool ED_uvedit_nearest_uv_multi(Scene *scene, +bool ED_uvedit_nearest_uv_multi(const Scene *scene, Image *ima, Object **objects, const uint objects_len, @@ -1472,7 +1493,7 @@ static int uv_select_more_less(bContext *C, const bool select) BMFace *efa; BMLoop *l; BMIter iter, liter; - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; uint objects_len = 0; Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs( @@ -1639,7 +1660,7 @@ static void uv_weld_align(bContext *C, eUVWeldAlign tool) ViewLayer *view_layer = CTX_data_view_layer(C); SpaceImage *sima = CTX_wm_space_image(C); Image *ima = CTX_data_edit_image(C); - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; const bool synced_selection = (ts->uv_flag & UV_SYNC_SELECTION) != 0; float cent[2], min[2], max[2]; @@ -1952,7 +1973,7 @@ static int uv_remove_doubles_to_selected(bContext *C, wmOperator *op) ViewLayer *view_layer = CTX_data_view_layer(C); SpaceImage *sima = CTX_wm_space_image(C); Image *ima = CTX_data_edit_image(C); - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; const float threshold = RNA_float_get(op->ptr, "threshold"); const bool synced_selection = (ts->uv_flag & UV_SYNC_SELECTION) != 0; @@ -2097,7 +2118,7 @@ static int uv_remove_doubles_to_unselected(bContext *C, wmOperator *op) ViewLayer *view_layer = CTX_data_view_layer(C); SpaceImage *sima = CTX_wm_space_image(C); Image *ima = CTX_data_edit_image(C); - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; const float threshold = RNA_float_get(op->ptr, "threshold"); const bool synced_selection = (ts->uv_flag & UV_SYNC_SELECTION) != 0; @@ -2271,7 +2292,7 @@ static void UV_OT_weld(wmOperatorType *ot) static bool uv_select_is_any_selected(Scene *scene, Image *ima, Object *obedit) { - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; @@ -2316,7 +2337,7 @@ static bool uv_select_is_any_selected_multi(Scene *scene, static void uv_select_all_perform(Scene *scene, Image *ima, Object *obedit, int action) { - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; @@ -2389,7 +2410,7 @@ static int uv_select_all_exec(bContext *C, wmOperator *op) { Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); Scene *scene = CTX_data_scene(C); - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; Image *ima = CTX_data_edit_image(C); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -2470,7 +2491,7 @@ static int uv_mouse_select_multi(bContext *C, Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); SpaceImage *sima = CTX_wm_space_image(C); Scene *scene = CTX_data_scene(C); - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; Image *ima = CTX_data_edit_image(C); BMFace *efa; BMLoop *l; @@ -2905,7 +2926,7 @@ static int uv_select_linked_internal(bContext *C, wmOperator *op, const wmEvent { SpaceImage *sima = CTX_wm_space_image(C); Scene *scene = CTX_data_scene(C); - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; ViewLayer *view_layer = CTX_data_view_layer(C); Image *ima = CTX_data_edit_image(C); float limit[2]; @@ -3078,7 +3099,7 @@ static int uv_select_split_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; Image *ima = CTX_data_edit_image(C); BMFace *efa; @@ -3163,7 +3184,7 @@ static void UV_OT_select_split(wmOperatorType *ot) ot->poll = ED_operator_uvedit; /* requires space image */ } -static void uv_select_sync_flush(ToolSettings *ts, BMEditMesh *em, const short select) +static void uv_select_sync_flush(const ToolSettings *ts, BMEditMesh *em, const short select) { /* bmesh API handles flushing but not on de-select */ if (ts->uv_flag & UV_SYNC_SELECTION) { @@ -3278,7 +3299,7 @@ static void uv_select_flush_from_tag_face(SpaceImage *sima, * This only needs to be done when the Mesh is not used for * selection (so for sticky modes, vertex or location based). */ - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; @@ -3364,7 +3385,7 @@ static void uv_select_flush_from_tag_loop(SpaceImage *sima, * This only needs to be done when the Mesh is not used for * selection (so for sticky modes, vertex or location based). */ - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; @@ -3443,7 +3464,7 @@ static int uv_box_select_exec(bContext *C, wmOperator *op) Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); SpaceImage *sima = CTX_wm_space_image(C); Scene *scene = CTX_data_scene(C); - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; ViewLayer *view_layer = CTX_data_view_layer(C); Image *ima = CTX_data_edit_image(C); ARegion *ar = CTX_wm_region(C); @@ -3603,7 +3624,7 @@ static int uv_circle_select_exec(bContext *C, wmOperator *op) Image *ima = CTX_data_edit_image(C); Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; ARegion *ar = CTX_wm_region(C); BMFace *efa; BMLoop *l; @@ -3743,7 +3764,7 @@ static bool do_lasso_select_mesh_uv(bContext *C, Image *ima = CTX_data_edit_image(C); ARegion *ar = CTX_wm_region(C); Scene *scene = CTX_data_scene(C); - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; ViewLayer *view_layer = CTX_data_view_layer(C); const bool use_face_center = ((ts->uv_flag & UV_SYNC_SELECTION) ? (ts->selectmode == SCE_SELECT_FACE) : @@ -4119,7 +4140,7 @@ static int uv_snap_selection_exec(bContext *C, wmOperator *op) ViewLayer *view_layer = CTX_data_view_layer(C); SpaceImage *sima = CTX_wm_space_image(C); Image *ima = CTX_data_edit_image(C); - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; const bool synced_selection = (ts->uv_flag & UV_SYNC_SELECTION) != 0; const int target = RNA_enum_get(op->ptr, "target"); float offset[2] = {0}; @@ -4214,7 +4235,7 @@ static int uv_pin_exec(bContext *C, wmOperator *op) BMLoop *l; BMIter iter, liter; MLoopUV *luv; - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; const bool clear = RNA_boolean_get(op->ptr, "clear"); const bool synced_selection = (ts->uv_flag & UV_SYNC_SELECTION) != 0; @@ -4291,7 +4312,7 @@ static int uv_select_pinned_exec(bContext *C, wmOperator *UNUSED(op)) { Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); Scene *scene = CTX_data_scene(C); - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; ViewLayer *view_layer = CTX_data_view_layer(C); Image *ima = CTX_data_edit_image(C); BMFace *efa; @@ -4622,7 +4643,7 @@ static int uv_hide_exec(bContext *C, wmOperator *op) SpaceImage *sima = CTX_wm_space_image(C); Object *obedit = CTX_data_edit_object(C); Scene *scene = CTX_data_scene(C); - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; @@ -4745,7 +4766,7 @@ static int uv_reveal_exec(bContext *C, wmOperator *op) SpaceImage *sima = CTX_wm_space_image(C); Object *obedit = CTX_data_edit_object(C); Scene *scene = CTX_data_scene(C); - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; BMEditMesh *em = BKE_editmesh_from_object(obedit); BMFace *efa; BMLoop *l; @@ -5098,7 +5119,7 @@ static int uv_mark_seam_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); - ToolSettings *ts = scene->toolsettings; + const ToolSettings *ts = scene->toolsettings; BMFace *efa; BMLoop *loop; |