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
path: root/source
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2019-06-10 00:39:55 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2019-06-10 00:42:18 +0300
commita44f5a561f94ea5fc11a06e75c73fe15799b9e65 (patch)
treed32dc1d2c446c718d895f3f423e1eb38d4b3198b /source
parent702d85d7cddbf819c386b525cb7f3b45c79913b8 (diff)
Revert "Fix T65301: Convert to mesh with Keep Original loses adjust operator panel."
This reverts commit rB78bbf374f475 (and part of rB702d85d7cddbf81). Fix for this is actually simpler, done in next commit.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/object/object_add.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 4ab4290d867..77964e2e100 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -2320,7 +2320,6 @@ static int convert_exec(bContext *C, wmOperator *op)
if (obact->type == OB_MBALL) {
basact = basen;
}
- ED_object_base_select(basen, BA_SELECT);
mballConverted = 1;
}
@@ -2343,11 +2342,6 @@ static int convert_exec(bContext *C, wmOperator *op)
basact = basen;
}
- if (keep_original) {
- ED_object_base_select(base, BA_DESELECT);
- ED_object_base_select(basen, BA_SELECT);
- }
-
basen = NULL;
}