Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2022-07-20 15:49:14 +0300
committerJulian Eisel <julian@blender.org>2022-07-20 15:54:32 +0300
commita814c7091b9a22067517b24b1f9c2de366717cbd (patch)
tree3c7492f21606404f695af49654913c36b9dbe92a /source/blender/editors/space_node/node_add.cc
parent7f8d05131a7738327ae125d065df44be492ff1f2 (diff)
Fix T99847: Dragging image from Image Editor to Node Editor broken
Oversight in b0da080c2cb9. The `session_uuid` operator property wouldn't be checked by the invoke callback, and if neither the `filepath` nor the `name` property were set, the File Browser would open.
Diffstat (limited to 'source/blender/editors/space_node/node_add.cc')
-rw-r--r--source/blender/editors/space_node/node_add.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_node/node_add.cc b/source/blender/editors/space_node/node_add.cc
index 04bf5ef469e..a89b5444a4d 100644
--- a/source/blender/editors/space_node/node_add.cc
+++ b/source/blender/editors/space_node/node_add.cc
@@ -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);