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:
authorBastien Montagne <bastien@blender.org>2020-04-16 17:19:44 +0300
committerBastien Montagne <bastien@blender.org>2020-04-16 17:21:11 +0300
commit81bb2a143c5e9cb5885717b7f1dca84fdba41c0b (patch)
tree05e24cdaf595788d7bb32f71ced61c2dbe01b73b /source/blender/blenloader
parentdac609120785ad26a3ba56cb32019226c0f9762d (diff)
Fix T75730: Properly remove unused override properties/operations.
While code is supposed to handle gracefully invalid override operations, it is much cleaner to avoid those completely.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 9ff5ab3a648..232cf3d73df 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2762,6 +2762,8 @@ static void direct_link_id_override_property_operation_cb(FileData *fd, void *da
opop->subitem_reference_name = newdataadr(fd, opop->subitem_reference_name);
opop->subitem_local_name = newdataadr(fd, opop->subitem_local_name);
+
+ opop->tag = 0; /* Runtime only. */
}
static void direct_link_id_override_property_cb(FileData *fd, void *data)
@@ -2769,6 +2771,9 @@ static void direct_link_id_override_property_cb(FileData *fd, void *data)
IDOverrideLibraryProperty *op = data;
op->rna_path = newdataadr(fd, op->rna_path);
+
+ op->tag = 0; /* Runtime only. */
+
link_list_ex(fd, &op->operations, direct_link_id_override_property_operation_cb);
}