diff options
author | Bastien Montagne <bastien@blender.org> | 2020-08-17 17:45:30 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-08-17 17:45:30 +0300 |
commit | fd6725cbfb113b0add60426154903ddb79e0c18f (patch) | |
tree | 6cc1909c23deb039ba61d80cf184e4dfb8ef073b /source/blender/makesrna | |
parent | d88721879b942641384612d888a8e785b96ef0f5 (diff) | |
parent | c7a7a38b653a3587302a000355159784decee4a6 (diff) |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_access_compare_override.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_access_compare_override.c b/source/blender/makesrna/intern/rna_access_compare_override.c index 0a739dcfc5a..ac4553349cc 100644 --- a/source/blender/makesrna/intern/rna_access_compare_override.c +++ b/source/blender/makesrna/intern/rna_access_compare_override.c @@ -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; } } |