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

Merge branch 'blender-v4.4-release'

Browse Source
This commit is contained in:
Hans Goudey
2025-03-07 12:50:29 -05:00
parent 99fa22a01f 3f87120ccf
commit a5d1aecbc3
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc
View File

@@ -3318,7 +3318,7 @@ static void GREASE_PENCIL_OT_reproject(wmOperatorType *ot)
/* callbacks */
ot->invoke = WM_menu_invoke;
ot->exec = grease_pencil_reproject_exec;
ot->poll = editable_grease_pencil_poll;
ot->poll = editable_grease_pencil_with_region_view3d_poll;
ot->ui = grease_pencil_reproject_ui;
/* flags */
@@ -3782,7 +3782,7 @@ static void GREASE_PENCIL_OT_texture_gradient(wmOperatorType *ot)
ot->invoke = grease_pencil_texture_gradient_invoke;
ot->modal = grease_pencil_texture_gradient_modal;
ot->exec = grease_pencil_texture_gradient_exec;
ot->poll = editable_grease_pencil_poll;
ot->poll = editable_grease_pencil_with_region_view3d_poll;
ot->cancel = WM_gesture_straightline_cancel;
/* Flags. */

5
source/blender/editors/grease_pencil/intern/grease_pencil_ops.cc
View File

@@ -64,6 +64,11 @@ bool editable_grease_pencil_poll(bContext *C)
return true;
}
bool editable_grease_pencil_with_region_view3d_poll(bContext *C)
{
return ED_operator_region_view3d_active(C) && editable_grease_pencil_poll(C);
}
bool active_grease_pencil_layer_poll(bContext *C)
{
const GreasePencil *grease_pencil = blender::ed::greasepencil::from_context(*C);

1
source/blender/editors/include/ED_grease_pencil.hh
View File

@@ -317,6 +317,7 @@ bool grease_pencil_context_poll(bContext *C);
bool active_grease_pencil_poll(bContext *C);
bool active_grease_pencil_material_poll(bContext *C);
bool editable_grease_pencil_poll(bContext *C);
bool editable_grease_pencil_with_region_view3d_poll(bContext *C);
bool active_grease_pencil_layer_poll(bContext *C);
bool active_grease_pencil_layer_group_poll(bContext *C);
bool editable_grease_pencil_point_selection_poll(bContext *C);

6
source/blender/modifiers/intern/MOD_nodes.cc
View File

@@ -2267,6 +2267,12 @@ static bool interface_panel_affects_output(DrawGroupInputsContext &ctx,
for (const bNodeTreeInterfaceItem *item : panel.items()) {
if (item->item_type == NODE_INTERFACE_SOCKET) {
const auto &socket = *reinterpret_cast<const bNodeTreeInterfaceSocket *>(item);
if (socket.flag & NODE_INTERFACE_SOCKET_HIDE_IN_MODIFIER) {
continue;
}
if (!(socket.flag & NODE_INTERFACE_SOCKET_INPUT)) {
continue;
}
const int input_index = ctx.nmd.node_group->interface_input_index(socket);
if (ctx.input_usages[input_index]) {
return true;