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

Fix T68971: Copy As New Driver from Material node creates a bad reference.

Browse Source 
NodeTree structures of materials and some other data blocks are
effectively node group datablock objects that are contained inside
the parent block. Thus, direct references to them are only valid
while blender is running, and are lost on save.

Fix Copy As New Driver to create a reference that goes through
the owner datablock, by adding a new ID flag to mark private
pseudo-datablocks.

Also fix functions that return full paths to structures and
properties, e.g. used in python tooltips. Functions for paths
from ID to struct or property can't be changed because of
Animation Data related code.

Reviewers: mont29

Differential Revision: https://developer.blender.org/D5559
This commit is contained in:
Alexander Gavrilov
2019-08-22 20:43:19 +03:00
parent 69a966aca0
commit 34ed58dcaf
13 changed files with 189 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/editors/interface/interface_ops.c
View File

@@ -100,10 +100,12 @@ static bool copy_data_path_button_poll(bContext *C)
static int copy_data_path_button_exec(bContext *C, wmOperator *op)
{
Main *bmain = CTX_data_main(C);
PointerRNA ptr;
PropertyRNA *prop;
char *path;
int index;
ID *id;
const bool full_path = RNA_boolean_get(op->ptr, "full_path");
@@ -111,18 +113,20 @@ static int copy_data_path_button_exec(bContext *C, wmOperator *op)
UI_context_active_but_prop_get(C, &ptr, &prop, &index);
if (ptr.owner_id != NULL) {
if (full_path) {
if (prop) {
path = RNA_path_full_property_py_ex(&ptr, prop, index, true);
path = RNA_path_full_property_py_ex(bmain, &ptr, prop, index, true);
}
else {
path = RNA_path_full_struct_py(&ptr);
path = RNA_path_full_struct_py(bmain, &ptr);
}
}
else {
path = RNA_path_from_ID_to_property(&ptr, prop);
path = RNA_path_from_real_ID_to_property_index(bmain, &ptr, prop, 0, -1, &id);
if (!path) {
path = RNA_path_from_ID_to_property(&ptr, prop);
}
}
if (path) {
@@ -185,8 +189,9 @@ static bool copy_as_driver_button_poll(bContext *C)
return 0;
}
static int copy_as_driver_button_exec(bContext *C, wmOperator *UNUSED(op))
static int copy_as_driver_button_exec(bContext *C, wmOperator *op)
{
Main *bmain = CTX_data_main(C);
PointerRNA ptr;
PropertyRNA *prop;
int index;
@@ -195,14 +200,19 @@ static int copy_as_driver_button_exec(bContext *C, wmOperator *UNUSED(op))
UI_context_active_but_prop_get(C, &ptr, &prop, &index);
if (ptr.owner_id && ptr.data && prop) {
ID *id;
int dim = RNA_property_array_dimension(&ptr, prop, NULL);
char *path = RNA_path_from_ID_to_property_index(&ptr, prop, dim, index);
char *path = RNA_path_from_real_ID_to_property_index(bmain, &ptr, prop, dim, index, &id);
if (path) {
ANIM_copy_as_driver(ptr.owner_id, path, RNA_property_identifier(prop));
ANIM_copy_as_driver(id, path, RNA_property_identifier(prop));
MEM_freeN(path);
return OPERATOR_FINISHED;
}
else {
BKE_reportf(op->reports, RPT_ERROR, "Could not compute a valid data path");
return OPERATOR_CANCELLED;
}
}
return OPERATOR_CANCELLED;