diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-03-26 04:47:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-26 07:32:40 +0300 |
| commit | 52cff88f72674ff77638a5e60d8837e6c715b34e (patch) | |
| tree | b9c3cbedd602981f64c4818517ddef87bf8ebc81 /source/blender/editors/object/object_relations.c | |
| parent | a8e749f624a847149658d763cf1168dfd4fc2f7f (diff) | |
Fix crash when make proxy failed to assign a proxy
Diffstat (limited to 'source/blender/editors/object/object_relations.c')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index c6d6a7b1c22..3166c9ddea1 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -417,7 +417,12 @@ static int make_proxy_exec(bContext *C, wmOperator *op) * TODO(sergey): We really need to get rid of this bi-directional links * in proxies with something like library overrides. */ - newob->proxy->proxy_from = newob; + if (newob->proxy != NULL) { + newob->proxy->proxy_from = newob; + } + else { + BKE_report(op->reports, RPT_ERROR, "Unable to assign proxy"); + } /* depsgraph flushes are needed for the new data */ DEG_relations_tag_update(bmain); |