blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Merge branch 'blender-v2.90-release' into master

This commit is contained in:
Bastien Montagne 2020-08-17 16:45:30 +02:00
parent d88721879b c7a7a38b65
commit fd6725cbfb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesrna/intern/rna_access_compare_override.c
View File

@ -484,13 +484,13 @@ static bool rna_property_override_operation_apply(Main *bmain,
/* Special case for IDProps, we use default callback then. */
if (prop_dst->magic != RNA_MAGIC) {
override_apply = rna_property_override_apply_default;
if (prop_src->magic == RNA_MAGIC && prop_src->override_apply != override_apply) {
if (prop_src->magic == RNA_MAGIC && !ELEM(prop_src->override_apply, NULL, override_apply)) {
override_apply = NULL;
}
}
else if (prop_src->magic != RNA_MAGIC) {
override_apply = rna_property_override_apply_default;
if (prop_dst->override_apply != override_apply) {
if (!ELEM(prop_dst->override_apply, NULL, override_apply)) {
override_apply = NULL;
}
}