archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix further issues when mixing link & append for asset drag & drop

Browse Source 
917c096be6 applied to objects only, this also applies the same fix for
the general 3D View drop operations, e.g. used for dragging materials,
images, worlds, etc.

This is needed to fix T95706, but apparently something else is still
going on. Needs further investigation.
This commit is contained in:
Julian Eisel
2022-05-23 20:54:15 +02:00
parent 0d6dda4555
commit 8f79fa9c67
4 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/windowmanager/WM_api.h
View File

@@ -771,6 +771,15 @@ void WM_operator_properties_filesel(struct wmOperatorType *ot,
short display,
short sort);
/**
* Tries to pass \a id to an operator via either a "session_uuid" or a "name" property defined in
* the properties of \a ptr. The former is preferred, since it works properly with linking and
* library overrides (which may both result in multiple IDs with the same name and type).
*
* Also see #WM_operator_properties_id_lookup() and
* #WM_operator_properties_id_lookup_from_name_or_session_uuid()
*/
void WM_operator_properties_id_lookup_set_from_id(PointerRNA *ptr, const ID *id);
/**
* Tries to find an ID in \a bmain. There needs to be either a "name" string or "session_uuid" int
* property defined and set. The former has priority. See #WM_operator_properties_id_lookup() for a

16
source/blender/windowmanager/intern/wm_operator_props.c
View File

@@ -226,6 +226,22 @@ void WM_operator_properties_filesel(wmOperatorType *ot,
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
}
void WM_operator_properties_id_lookup_set_from_id(PointerRNA *ptr, const ID *id)
{
PropertyRNA *prop_session_uuid = RNA_struct_find_property(ptr, "session_uuid");
PropertyRNA *prop_name = RNA_struct_find_property(ptr, "name");
if (prop_session_uuid) {
RNA_int_set(ptr, "session_uuid", (int)id->session_uuid);
}
else if (prop_name) {
RNA_string_set(ptr, "name", id->name + 2);
}
else {
BLI_assert_unreachable();
}
}
ID *WM_operator_properties_id_lookup_from_name_or_session_uuid(Main *bmain,
const wmOperator *op,
const ID_Type type)