blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Fix (unreported) several issues when converting MBall to Mesh. 

Redo panel would be hidden (when 'keep original' was not set), due to
same kind of (un)selected issue as in T65301 (see previous commit).

Further more, not all MBall objects of the family were properly removed.
This commit is contained in:
Bastien Montagne 2019-06-09 22:56:37 +02:00
parent 78bbf374f4
commit 702d85d7cd
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/object/object_add.c
View File

@ -2320,6 +2320,7 @@ static int convert_exec(bContext *C, wmOperator *op)
if (obact->type == OB_MBALL) {
basact = basen;
}
ED_object_base_select(basen, BA_SELECT);
mballConverted = 1;
}
@ -2359,13 +2360,22 @@ static int convert_exec(bContext *C, wmOperator *op)
if (!keep_original) {
if (mballConverted) {
/* We need to remove non-basis MBalls first, otherwise we won't be able to detect them if
* their basis happens to be removed first. */
FOREACH_SCENE_OBJECT_BEGIN (scene, ob_mball) {
if (ob_mball->type == OB_MBALL) {
Object *ob_basis = NULL;
if (!BKE_mball_is_basis(ob_mball) &&
((ob_basis = BKE_mball_basis_find(scene, ob_mball)) && (ob_basis->flag & OB_DONE))) {
ED_object_base_free_and_unlink(bmain, scene, ob_mball);
}
}
}
FOREACH_SCENE_OBJECT_END;
FOREACH_SCENE_OBJECT_BEGIN (scene, ob_mball) {
if (ob_mball->type == OB_MBALL) {
if (ob_mball->flag & OB_DONE) {
Object *ob_basis = NULL;
if (BKE_mball_is_basis(ob_mball) ||
((ob_basis = BKE_mball_basis_find(scene, ob_mball)) &&
(ob_basis->flag & OB_DONE))) {
if (BKE_mball_is_basis(ob_mball)) {
ED_object_base_free_and_unlink(bmain, scene, ob_mball);
}
}