Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2020-01-24 11:57:55 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2020-01-24 11:57:55 +0300
commit726c7ba6329f5949f149652763312347bb0f02a8 (patch)
treec1167cbe6e4ad7b4c4189213003dfffd7c3959bd /source/blender/editors/object
parentd6bd359545d3765737f5222b84b3f20811c9b3ff (diff)
parent005af1e274599939c71dce4e9fa7e0e64e6b531f (diff)
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/object_relations.c1
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) {