diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2022-07-26 00:43:48 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2022-07-26 00:43:48 +0300 |
| commit | f081e76037432cb926be45e980eac201d337032c (patch) | |
| tree | dd1225521c12ea21c0b0c3d51ec1ae3f8730755f /source/blender/editors/space_node/node_add.cc | |
| parent | fa2084ae58a77b1201289b6bedac427f73c762d1 (diff) | |
| parent | 462f99bf38648a08226b1fba423315aec2bc577b (diff) | |
Merge branch 'master' into geometry-nodes-iterative-cachegeometry-nodes-rigid-body-integration
Diffstat (limited to 'source/blender/editors/space_node/node_add.cc')
| -rw-r--r-- | source/blender/editors/space_node/node_add.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_node/node_add.cc b/source/blender/editors/space_node/node_add.cc index 715b7c80d1d..17906dcae35 100644 --- a/source/blender/editors/space_node/node_add.cc +++ b/source/blender/editors/space_node/node_add.cc @@ -382,7 +382,7 @@ static bool node_add_group_poll(bContext *C) if (snode->edittree->type == NTREE_CUSTOM) { CTX_wm_operator_poll_msg_set(C, "This node editor displays a custom (Python defined) node tree. " - "Dropping node groups isn't supported for this."); + "Dropping node groups isn't supported for this"); return false; } return true; @@ -690,8 +690,8 @@ static int node_add_file_invoke(bContext *C, wmOperator *op, const wmEvent *even snode->runtime->cursor[0] /= UI_DPI_FAC; snode->runtime->cursor[1] /= UI_DPI_FAC; - if (RNA_struct_property_is_set(op->ptr, "filepath") || - RNA_struct_property_is_set(op->ptr, "name")) { + if (WM_operator_properties_id_lookup_is_set(op->ptr) || + RNA_struct_property_is_set(op->ptr, "filepath")) { return node_add_file_exec(C, op); } return WM_operator_filesel(C, op, event); |