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

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Harley Acheson
2024-07-08 12:36:28 -07:00
parent 792efafa2c 9a26bfcd5f
commit f95436de08
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/object/object_edit.cc
View File

@@ -1604,6 +1604,8 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
CTX_data_selected_editable_objects(C, &ctx_objects);
}
bool modifier_removed = false;
Set<ID *> object_data;
for (const PointerRNA &ptr : ctx_objects) {
Object *ob = static_cast<Object *>(ptr.data);
@@ -1616,6 +1618,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
if (is_smooth_by_angle_modifier(*md)) {
modifier_remove(op->reports, bmain, scene, ob, md);
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
modifier_removed = true;
break;
}
}
@@ -1651,13 +1654,16 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
if (changed) {
changed_multi = true;
DEG_id_tag_update(data, ID_RECALC_GEOMETRY);
WM_event_add_notifier(C, NC_GEOM | ND_DATA, data);
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, nullptr);
}
}
if (modifier_removed) {
/* Outliner needs to know. #124302. */
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, nullptr);
}
if (has_linked_data) {
BKE_report(op->reports, RPT_WARNING, "Can't edit linked mesh or curve data");
}