blender
/
blender
134
400
Fork 584
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

Fix T50950: Converting meshes fails w/ boolean

This commit is contained in:
Campbell Barton 2017-03-17 09:58:05 +11:00
parent d4d8da28fc
commit 750c0dd4de
Notes: blender-bot 2023-02-14 07:08:26 +01:00 
Referenced by issue #50950, converting all to mesh doesn't work when a boolean and solidify are present in scene.
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1656,8 +1656,25 @@ static int convert_exec(bContext *C, wmOperator *op)
}
}
CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
ListBase selected_editable_bases = CTX_data_collection_get(C, "selected_editable_bases");
/* Ensure we get all meshes calculated with a sufficient data-mask,
* needed since re-evaluating single modifiers causes bugs if they depend
* on other objects data masks too, see: T50950. */
{
for (CollectionPointerLink *link = selected_editable_bases.first; link; link = link->next) {
Base *base = link->ptr.data;
DAG_id_tag_update(&base->object->id, OB_RECALC_DATA);
}
uint64_t customdata_mask_prev = scene->customdata_mask;
scene->customdata_mask |= CD_MASK_MESH;
BKE_scene_update_tagged(bmain->eval_ctx, bmain, scene);
scene->customdata_mask = customdata_mask_prev;
}
for (CollectionPointerLink *link = selected_editable_bases.first; link; link = link->next) {
Base *base = link->ptr.data;
ob = base->object;
if (ob->flag & OB_DONE || !IS_TAGGED(ob->data)) {
@ -1889,7 +1906,7 @@ static int convert_exec(bContext *C, wmOperator *op)
((ID *)ob->data)->tag &= ~LIB_TAG_DOIT; /* flag not to convert this datablock again */
}
}
CTX_DATA_END;
BLI_freelistN(&selected_editable_bases);
if (!keep_original) {
if (mballConverted) {