griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Sean Kim
2025-06-04 15:02:57 -07:00
parent 99736cc6ca e906fe2738
commit 653601a416
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/engines/overlay/overlay_mesh.hh
View File

@@ -634,7 +634,7 @@ class MeshUVs : Overlay {
/* Wireframe UV Overlay. */
const bool show_wireframe_uv_edit = space_image->flag & SI_DRAWSHADOW;
const bool show_wireframe_uv_guide = !(space_image->flag & SI_NO_DRAW_UV_GUIDE) &&
space_mode_is_paint;
(space_mode_is_paint || space_mode_is_uv);
if (space_mode_is_uv && object_mode_is_edit) {
show_wireframe_ = show_wireframe_uv_edit;

4
source/blender/editors/space_image/space_image.cc
View File

@@ -411,7 +411,9 @@ static void image_listener(const wmSpaceTypeListenerParams *params)
}
}
else if (ob) {
if (sima->lock && !(sima->flag & SI_NO_DRAW_UV_GUIDE) && sima->mode == SI_MODE_PAINT) {
if (sima->lock && !(sima->flag & SI_NO_DRAW_UV_GUIDE) &&
ELEM(sima->mode, SI_MODE_PAINT, SI_MODE_UV))
{
ED_area_tag_refresh(area);
ED_area_tag_redraw(area);
}