tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

LibOverride: Fix potential minor issues in RNA liboverride handling code.

This commit is contained in:
Bastien Montagne 2023-07-08 16:07:49 +02:00
parent 2dfbd653a0
commit 6dd51353dd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/makesrna/intern/rna_access_compare_override.cc
View File

@ -1102,7 +1102,7 @@ static void rna_porperty_override_collection_subitem_lookup(
CLOG_INFO(&LOG,
2,
"Failed to find destination sub-item '%s' (%d) of '%s' in new override data '%s'",
opop->subitem_reference_name,
opop->subitem_reference_name != NULL ? opop->subitem_reference_name : "",
opop->subitem_reference_index,
op->rna_path,
ptr_dst->owner_id->name);
@ -1114,7 +1114,7 @@ static void rna_porperty_override_collection_subitem_lookup(
CLOG_INFO(&LOG,
2,
"Failed to find source sub-item '%s' (%d) of '%s' in old override data '%s'",
opop->subitem_local_name,
opop->subitem_local_name != NULL ? opop->subitem_local_name : "",
opop->subitem_local_index,
op->rna_path,
ptr_src->owner_id->name);
@ -1371,7 +1371,7 @@ void RNA_struct_override_apply(Main *bmain,
if ((flag & RNA_OVERRIDE_APPLY_FLAG_SKIP_RESYNC_CHECK) == 0 &&
(ptr_dst->owner_id->tag & LIB_TAG_LIBOVERRIDE_NEED_RESYNC) == 0)
{
if (op->rna_prop_type == PROP_POINTER &&
if (op->rna_prop_type == PROP_POINTER && op->operations.first != NULL &&
(((IDOverrideLibraryPropertyOperation *)op->operations.first)->flag &
LIBOVERRIDE_OP_FLAG_IDPOINTER_MATCH_REFERENCE) != 0)
{