diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2019-07-29 13:40:49 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2019-07-29 16:28:00 +0300 |
| commit | 0ae52711b6b86a40e6aae989e6fb84f5803a9e74 (patch) | |
| tree | 98d774a30208f8d7fc5e05fdfa6109b892000e86 /source/blender/makesrna | |
| parent | baff245b9d64b7e2f82f81ef0100237e1c024fbc (diff) | |
Fix T67857: crash assigning None to the data of an empty using python
Assigning None is allowed for (image) empties.
Reviewers: sergey
Maniphest Tasks: T67857
Differential Revision: https://developer.blender.org/D5362
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index d3b532dd11d..7fa1544d809 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -441,7 +441,7 @@ static void rna_Object_data_set(PointerRNA *ptr, PointerRNA value, struct Report return; } - if ((id->tag & LIB_TAG_NO_MAIN) != (ob->id.tag & LIB_TAG_NO_MAIN)) { + if (id && ((id->tag & LIB_TAG_NO_MAIN) != (ob->id.tag & LIB_TAG_NO_MAIN))) { BKE_report(reports, RPT_ERROR, "Can only assign evaluated data to evaluated object, or original data to " |