[Bf-blender-cvs] [52cff88f726] master: Fix crash when make proxy failed to assign a proxy

[Campbell Barton]

Commit: 52cff88f72674ff77638a5e60d8837e6c715b34e
Author: Campbell Barton
Date:   Thu Mar 26 12:47:21 2020 +1100
Branches: master
https://developer.blender.org/rB52cff88f72674ff77638a5e60d8837e6c715b34e

Fix crash when make proxy failed to assign a proxy

===================================================================

M	source/blender/editors/object/object_relations.c

===================================================================

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);