From e9ac7842378182b48749c37be3e9f573d273c112 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 2 Jan 2020 13:08:20 +1100 Subject: Cleanup: quiet const warnings --- source/blender/editors/include/ED_mesh.h | 2 +- source/blender/editors/include/ED_uvedit.h | 60 +++++++++++++++++------------- 2 files changed, 36 insertions(+), 26 deletions(-) (limited to 'source/blender/editors/include') diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index b28f645e982..246dba57bb5 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -109,7 +109,7 @@ void EDBM_update_generic(struct BMEditMesh *em, const bool is_destructive); struct UvElementMap *BM_uv_element_map_create(struct BMesh *bm, - struct Scene *scene, + const struct Scene *scene, const bool face_selected, const bool uv_selected, const bool use_winding, diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index 1856ad8454b..1f50770eef6 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -45,18 +45,22 @@ struct wmKeyConfig; void ED_operatortypes_uvedit(void); void ED_keymap_uvedit(struct wmKeyConfig *keyconf); -bool ED_uvedit_minmax( - struct Scene *scene, struct Image *ima, struct Object *obedit, float min[2], float max[2]); -bool ED_uvedit_center(Scene *scene, Image *ima, struct Object *obedit, float cent[2], char mode); +bool ED_uvedit_minmax(const struct Scene *scene, + struct Image *ima, + struct Object *obedit, + float min[2], + float max[2]); +bool ED_uvedit_center( + const struct Scene *scene, Image *ima, struct Object *obedit, float cent[2], char mode); void ED_uvedit_select_all(struct BMesh *bm); -bool ED_uvedit_minmax_multi(struct Scene *scene, +bool ED_uvedit_minmax_multi(const struct Scene *scene, struct Image *ima, struct Object **objects_edit, uint objects_len, float r_min[2], float r_max[2]); -bool ED_uvedit_center_multi(Scene *scene, +bool ED_uvedit_center_multi(const struct Scene *scene, Image *ima, struct Object **objects_edit, uint objects_len, @@ -92,70 +96,76 @@ bool uvedit_uv_select_test_ex(const struct ToolSettings *ts, struct BMLoop *l, const int cd_loop_uv_offset); -bool uvedit_face_visible_nolocal(struct Scene *scene, struct BMFace *efa); -bool uvedit_face_visible_test(struct Scene *scene, +bool uvedit_face_visible_nolocal(const struct Scene *scene, struct BMFace *efa); +bool uvedit_face_visible_test(const struct Scene *scene, struct Object *obedit, struct Image *ima, struct BMFace *efa); -bool uvedit_face_select_test(struct Scene *scene, struct BMFace *efa, const int cd_loop_uv_offset); -bool uvedit_edge_select_test(struct Scene *scene, struct BMLoop *l, const int cd_loop_uv_offset); -bool uvedit_uv_select_test(struct Scene *scene, struct BMLoop *l, const int cd_loop_uv_offset); +bool uvedit_face_select_test(const struct Scene *scene, + struct BMFace *efa, + const int cd_loop_uv_offset); +bool uvedit_edge_select_test(const struct Scene *scene, + struct BMLoop *l, + const int cd_loop_uv_offset); +bool uvedit_uv_select_test(const struct Scene *scene, + struct BMLoop *l, + const int cd_loop_uv_offset); /* uv face */ -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, const bool do_history, const int cd_loop_uv_offset); -bool uvedit_face_select_enable(struct Scene *scene, +bool uvedit_face_select_enable(const struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa, const bool do_history, const int cd_loop_uv_offset); -bool uvedit_face_select_disable(struct Scene *scene, +bool uvedit_face_select_disable(const struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa, const int cd_loop_uv_offset); /* uv edge */ void uvedit_edge_select_set(struct BMEditMesh *em, - struct Scene *scene, + const struct Scene *scene, struct BMLoop *l, const bool select, const bool do_history, const int cd_loop_uv_offset); void uvedit_edge_select_enable(struct BMEditMesh *em, - struct Scene *scene, + const struct Scene *scene, struct BMLoop *l, const bool do_history, const int cd_loop_uv_offset); void uvedit_edge_select_disable(struct BMEditMesh *em, - struct Scene *scene, + const struct Scene *scene, struct BMLoop *l, const int cd_loop_uv_offset); /* uv vert */ void uvedit_uv_select_set(struct BMEditMesh *em, - struct Scene *scene, + const struct Scene *scene, struct BMLoop *l, const bool select, const bool do_history, const int cd_loop_uv_offset); void uvedit_uv_select_enable(struct BMEditMesh *em, - struct Scene *scene, + const struct Scene *scene, struct BMLoop *l, const bool do_history, const int cd_loop_uv_offset); void uvedit_uv_select_disable(struct BMEditMesh *em, - struct Scene *scene, + const struct Scene *scene, struct BMLoop *l, const int cd_loop_uv_offset); -bool ED_uvedit_nearest_uv(struct Scene *scene, +bool ED_uvedit_nearest_uv(const struct Scene *scene, struct Object *obedit, struct Image *ima, const float co[2], float *dist_sq, float r_uv[2]); -bool ED_uvedit_nearest_uv_multi(struct Scene *scene, +bool ED_uvedit_nearest_uv_multi(const struct Scene *scene, struct Image *ima, struct Object **objects, const uint objects_len, @@ -164,20 +174,20 @@ bool ED_uvedit_nearest_uv_multi(struct Scene *scene, float r_uv[2]); void ED_uvedit_get_aspect( - struct Scene *scene, struct Object *ob, struct BMesh *em, float *aspx, float *aspy); + const struct Scene *scene, struct Object *ob, struct BMesh *em, float *aspx, float *aspy); /* uvedit_unwrap_ops.c */ void ED_uvedit_live_unwrap_begin(struct Scene *scene, struct Object *obedit); void ED_uvedit_live_unwrap_re_solve(void); void ED_uvedit_live_unwrap_end(short cancel); -void ED_uvedit_live_unwrap(struct Scene *scene, struct Object **objects, int objects_len); -void ED_uvedit_add_simple_uvs(struct Main *bmain, struct Scene *scene, struct Object *ob); +void ED_uvedit_live_unwrap(const struct Scene *scene, struct Object **objects, int objects_len); +void ED_uvedit_add_simple_uvs(struct Main *bmain, const struct Scene *scene, struct Object *ob); /* uvedit_draw.c */ void ED_image_draw_cursor(struct ARegion *ar, const float cursor[2]); void ED_uvedit_draw_main(struct SpaceImage *sima, - struct Scene *scene, + const struct Scene *scene, struct ViewLayer *view_layer, struct Object *obedit, struct Object *obact, -- cgit v1.2.3