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

Fix #119406: Node tools don't work in edit mode with unselected object

Browse Source 
It's possible for an object to be in edit mode without being selected. Use the
`FOREACH_OBJECT_IN_MODE_BEGIN` iterator to find all objects in the mode instead.

Pull Request: https://projects.blender.org/blender/blender/pulls/119412
This commit is contained in:
Jacques Lucke
2024-03-13 13:49:35 +01:00
parent 297157e1c7
commit 61aaf95709
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/editors/geometry/node_group_operator.cc
View File

@@ -319,19 +319,38 @@ static Vector<Object *> gather_supported_objects(const bContext &C,
{
Vector<Object *> objects;
Set<const ID *> unique_object_data;
CTX_DATA_BEGIN (&C, Object *, object, selected_objects) {
auto handle_object = [&](Object *object) {
if (object->mode != mode) {
continue;
return;
}
if (!unique_object_data.add(static_cast<const ID *>(object->data))) {
continue;
return;
}
if (!object_has_editable_data(bmain, *object)) {
continue;
return;
}
objects.append(object);
};
if (mode == OB_MODE_OBJECT) {
CTX_DATA_BEGIN (&C, Object *, object, selected_objects) {
handle_object(object);
}
CTX_DATA_END;
}
else {
Scene *scene = CTX_data_scene(&C);
ViewLayer *view_layer = CTX_data_view_layer(&C);
View3D *v3d = CTX_wm_view3d(&C);
Object *active_object = CTX_data_active_object(&C);
if (v3d && active_object) {
FOREACH_OBJECT_IN_MODE_BEGIN (scene, view_layer, v3d, active_object->type, mode, ob) {
handle_object(ob);
}
FOREACH_OBJECT_IN_MODE_END;
}
}
CTX_DATA_END;
return objects;
}