[Bf-blender-cvs] [005af1e2745] blender-v2.82-release: Fix T72083: Object.proxy_collection is been set to linked target object even when target is not a collection

[Philipp Oeser]

Commit: 005af1e274599939c71dce4e9fa7e0e64e6b531f
Author: Philipp Oeser
Date:   Wed Jan 22 15:47:02 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB005af1e274599939c71dce4e9fa7e0e64e6b531f

Fix T72083: Object.proxy_collection is been set to linked target object
even when target is not a collection

Looks like this was (accidentally) removed in {rBbe9e469ead22}
https://developer.blender.org/
rBbe9e469ead227aee8d4c29b98a125cf599c5c8bb#change-pFg0VUTAHY2q

This could also result in a missing update in
object_handle_update_proxy, see T72083 for an example.

Thx @Macroni investigating!

Maniphest Tasks: T72083

Differential Revision: https://developer.blender.org/D6651

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

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 322043d7140..b9c89b9944f 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -386,6 +386,7 @@ static int make_proxy_exec(bContext *C, wmOperator *op)
   }
   else {
     ob = gob;
+    gob = NULL;
   }
 
   if (ob) {