[Bf-blender-cvs] [e9ac7842378] master: Cleanup: quiet const warnings
Campbell Barton
noreply at git.blender.org
Thu Jan 2 03:09:06 CET 2020
Commit: e9ac7842378182b48749c37be3e9f573d273c112
Author: Campbell Barton
Date: Thu Jan 2 13:08:20 2020 +1100
Branches: master
https://developer.blender.org/rBe9ac7842378182b48749c37be3e9f573d273c112
Cleanup: quiet const warnings
===================================================================
M source/blender/blenkernel/BKE_subsurf.h
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/editors/include/ED_mesh.h
M source/blender/editors/include/ED_uvedit.h
M source/blender/editors/uvedit/uvedit_draw.c
M source/blender/editors/uvedit/uvedit_ops.c
M source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h
index cd48e4d7f3b..70aa028a2c7 100644
--- a/source/blender/blenkernel/BKE_subsurf.h
+++ b/source/blender/blenkernel/BKE_subsurf.h
@@ -58,7 +58,7 @@ typedef enum {
struct DerivedMesh *subsurf_make_derived_from_derived(struct DerivedMesh *dm,
struct SubsurfModifierData *smd,
- struct Scene *scene,
+ const struct Scene *scene,
float (*vertCos)[3],
SubsurfFlags flags);
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 11d2314ace3..33a9875151a 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -2519,7 +2519,7 @@ static bool subsurf_use_gpu_backend(SubsurfFlags flags)
struct DerivedMesh *subsurf_make_derived_from_derived(struct DerivedMesh *dm,
struct SubsurfModifierData *smd,
- struct Scene *scene,
+ const struct Scene *scene,
float (*vertCos)[3],
SubsurfFlags flags)
{
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,
diff --git a/source/blender/editors/uvedit/uvedit_d
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list