diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-10-07 07:26:44 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-10-07 07:26:44 +0300 |
| commit | 2c803124d371bbbd564dd4c5051258f53b799d36 (patch) | |
| tree | 2fc642f1aa96ed9464483a7a7c57cf82f7531578 /source/blender/editors/include | |
| parent | 846d8ef8568c035cd7d4e1a8168a4ba391de9119 (diff) | |
| parent | cafd204af6d9969654bdee5ae14fef220640487c (diff) | |
Merge branch 'master' into refactor-mesh-position-generic
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/ED_uvedit.h | 6 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_view3d.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/include/UI_icons.h | 4 | ||||
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index 23cbcabbc0e..b499ae0ce59 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -107,7 +107,7 @@ bool uvedit_uv_select_test(const struct Scene *scene, struct BMLoop *l, int cd_l * Changes selection state of a single UV Face. */ void uvedit_face_select_set(const struct Scene *scene, - struct BMesh *em, + struct BMesh *bm, struct BMFace *efa, bool select, bool do_history, @@ -118,7 +118,7 @@ void uvedit_face_select_set(const struct Scene *scene, * Changes selection state of a single UV Edge. */ void uvedit_edge_select_set(const struct Scene *scene, - struct BMesh *em, + struct BMesh *bm, struct BMLoop *l, bool select, bool do_history, @@ -129,7 +129,7 @@ void uvedit_edge_select_set(const struct Scene *scene, * Changes selection state of a single UV vertex. */ void uvedit_uv_select_set(const struct Scene *scene, - struct BMesh *em, + struct BMesh *bm, struct BMLoop *l, bool select, bool do_history, diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 78b7274e42b..f475eeee335 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -459,7 +459,7 @@ void ED_view3d_project_float_v3_m4(const struct ARegion *region, eV3DProjStatus ED_view3d_project_base(const struct ARegion *region, struct Base *base, - short r_co[2]); + float r_co[2]); /* *** short *** */ eV3DProjStatus ED_view3d_project_short_ex(const struct ARegion *region, diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 09057fd846e..31c766e95f2 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -472,8 +472,8 @@ DEF_ICON_BLANK(742) DEF_ICON_BLANK(743) DEF_ICON_MODIFIER(CON_ACTION) DEF_ICON_BLANK(745) -DEF_ICON_BLANK(746) -DEF_ICON_BLANK(747) +DEF_ICON_MODIFIER(MOD_ENVELOPE) +DEF_ICON_MODIFIER(MOD_OUTLINE) DEF_ICON_MODIFIER(MOD_LENGTH) DEF_ICON_MODIFIER(MOD_DASH) DEF_ICON_MODIFIER(MOD_LINEART) diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index c3376493413..2a1941f0d9e 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -1393,6 +1393,7 @@ void UI_but_extra_icon_string_info_get(struct bContext *C, uiButExtraOpIcon *ext * - AutoButR: RNA property button with type automatically defined. */ enum { + UI_ID_NOP = 0, UI_ID_RENAME = 1 << 0, UI_ID_BROWSE = 1 << 1, UI_ID_ADD_NEW = 1 << 2, |