diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-01-22 17:47:02 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-01-24 11:54:03 +0300 |
| commit | 005af1e274599939c71dce4e9fa7e0e64e6b531f (patch) | |
| tree | e642bb9319ff7fcf87d2294d199161b7f87634f1 /source | |
| parent | c5436883c66ff16288cb17e8b54ddad4c91cb5f9 (diff) | |
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
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 1 |
1 files changed, 1 insertions, 0 deletions
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) { |